renamed include paths for common objects
This commit is contained in:
parent
6475b7b7ad
commit
e75daee148
|
@ -294,9 +294,6 @@ message(STATUS "Building for version: ${VERSION}")
|
|||
include_directories(${PROJECT_BINARY_DIR}/lib/include)
|
||||
include_directories(${PROJECT_SOURCE_DIR}/lib/include)
|
||||
|
||||
# Includes needed by all code previously resided in srsUE
|
||||
include_directories(${PROJECT_SOURCE_DIR}/lib/include/srslte)
|
||||
|
||||
########################################################################
|
||||
# Add headers to cmake project (useful for IDEs)
|
||||
########################################################################
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
INCLUDES
|
||||
*******************************************************************************/
|
||||
|
||||
#include "common/common.h"
|
||||
#include "srslte/common/common.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -33,10 +33,10 @@
|
|||
#ifndef INTERFACES_H
|
||||
#define INTERFACES_H
|
||||
|
||||
#include "asn1/liblte_rrc.h"
|
||||
#include "common/interfaces_common.h"
|
||||
#include "common/common.h"
|
||||
#include "common/security.h"
|
||||
#include "srslte/asn1/liblte_rrc.h"
|
||||
#include "srslte/common/interfaces_common.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/security.h"
|
||||
#include "mac_interface.h"
|
||||
#include "phy_interface.h"
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/timers.h"
|
||||
|
||||
#ifndef INTERFACE_COMMON_H
|
||||
#define INTERFACE_COMMON_H
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include <stdarg.h>
|
||||
#include <string>
|
||||
#include <common/log.h>
|
||||
#include "srslte/common/log.h"
|
||||
#include "logger.h"
|
||||
|
||||
namespace srslte {
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include <stdarg.h>
|
||||
#include <string>
|
||||
#include <common/log.h>
|
||||
#include "srslte/common/log.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include <stdio.h>
|
||||
#include <deque>
|
||||
#include <string>
|
||||
#include "common/threads.h"
|
||||
#include "srslte/common/threads.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -37,10 +37,10 @@
|
|||
#include <string>
|
||||
#include "srslte/srslte.h"
|
||||
|
||||
#include "common/interfaces_common.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/interfaces_common.h"
|
||||
#include "srslte/common/timers.h"
|
||||
|
||||
#include "asn1/liblte_rrc.h"
|
||||
#include "srslte/asn1/liblte_rrc.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#define MACPCAP_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "common/pcap.h"
|
||||
#include "srslte/common/pcap.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#define METRICS_HUB_H
|
||||
|
||||
#include <vector>
|
||||
#include "common/threads.h"
|
||||
#include "srslte/common/threads.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#ifndef MSG_QUEUE_H
|
||||
#define MSG_QUEUE_H
|
||||
|
||||
#include "common/common.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include <pthread.h>
|
||||
|
||||
namespace srslte {
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
#define MACPDU_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "common/log.h"
|
||||
#include "common/interfaces_common.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/interfaces_common.h"
|
||||
#include <vector>
|
||||
#include <stdio.h>
|
||||
|
||||
|
|
|
@ -27,11 +27,11 @@
|
|||
#ifndef PDUPROC_H
|
||||
#define PDUPROC_H
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/block_queue.h"
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/timers.h"
|
||||
#include "common/pdu.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/block_queue.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/timers.h"
|
||||
#include "srslte/common/pdu.h"
|
||||
|
||||
/* Logical Channel Demultiplexing and MAC CE dissassemble */
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <string>
|
||||
#include "srslte/srslte.h"
|
||||
|
||||
#include "asn1/liblte_rrc.h"
|
||||
#include "srslte/asn1/liblte_rrc.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
*****************************************************************************/
|
||||
|
||||
|
||||
#include "common/common.h"
|
||||
#include "srslte/common/common.h"
|
||||
|
||||
|
||||
#define SECURITY_DIRECTION_UPLINK 0
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <stdint.h>
|
||||
#include <string>
|
||||
#include <queue>
|
||||
#include "common/threads.h"
|
||||
#include "srslte/common/threads.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include <vector>
|
||||
#include <stack>
|
||||
|
||||
#include "common/threads.h"
|
||||
#include "srslte/common/threads.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#define TTISYNC_CV_H
|
||||
|
||||
#include <pthread.h>
|
||||
#include "common/tti_sync.h"
|
||||
#include "srslte/common/tti_sync.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
#ifndef GW_H
|
||||
#define GW_H
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/msg_queue.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/threads.h"
|
||||
#include "upper/gw_metrics.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/msg_queue.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/threads.h"
|
||||
#include "srslte/upper/gw_metrics.h"
|
||||
|
||||
#include <linux/if.h>
|
||||
|
||||
|
|
|
@ -27,10 +27,10 @@
|
|||
#ifndef PDCP_H
|
||||
#define PDCP_H
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "upper/pdcp_entity.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/upper/pdcp_entity.h"
|
||||
|
||||
using srslte::byte_buffer_t;
|
||||
|
||||
|
|
|
@ -27,11 +27,11 @@
|
|||
#ifndef PDCP_ENTITY_H
|
||||
#define PDCP_ENTITY_H
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/security.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/security.h"
|
||||
|
||||
using srslte::byte_buffer_t;
|
||||
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
#ifndef RLC_H
|
||||
#define RLC_H
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/msg_queue.h"
|
||||
#include "upper/rlc_entity.h"
|
||||
#include "upper/rlc_metrics.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/msg_queue.h"
|
||||
#include "srslte/upper/rlc_entity.h"
|
||||
#include "srslte/upper/rlc_metrics.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
#ifndef RLC_AM_H
|
||||
#define RLC_AM_H
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/msg_queue.h"
|
||||
#include "common/timeout.h"
|
||||
#include "upper/rlc_common.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/msg_queue.h"
|
||||
#include "srslte/common/timeout.h"
|
||||
#include "srslte/upper/rlc_common.h"
|
||||
#include <map>
|
||||
#include <deque>
|
||||
#include <list>
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
#ifndef RLC_ENTITY_H
|
||||
#define RLC_ENTITY_H
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "upper/rlc_common.h"
|
||||
#include "upper/rlc_tm.h"
|
||||
#include "upper/rlc_um.h"
|
||||
#include "upper/rlc_am.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/upper/rlc_common.h"
|
||||
#include "srslte/upper/rlc_tm.h"
|
||||
#include "srslte/upper/rlc_um.h"
|
||||
#include "srslte/upper/rlc_am.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -27,12 +27,12 @@
|
|||
#ifndef RLC_TM_H
|
||||
#define RLC_TM_H
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/msg_queue.h"
|
||||
#include "upper/rlc_common.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/msg_queue.h"
|
||||
#include "srslte/upper/rlc_common.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -27,12 +27,12 @@
|
|||
#ifndef RLC_UM_H
|
||||
#define RLC_UM_H
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/msg_queue.h"
|
||||
#include "upper/rlc_common.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/msg_queue.h"
|
||||
#include "srslte/upper/rlc_common.h"
|
||||
#include <pthread.h>
|
||||
#include <map>
|
||||
#include <queue>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
|
||||
#include <pthread.h>
|
||||
#include "common/buffer_pool.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include <stdio.h>
|
||||
#include <string>
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "common/log_filter.h"
|
||||
#include "srslte/common/log_filter.h"
|
||||
|
||||
namespace srslte{
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include <stdarg.h>
|
||||
#include <string>
|
||||
|
||||
#include "common/log_stdout.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#define LOG_BUFFER_SIZE 1024*32
|
||||
|
||||
#include "common/logger.h"
|
||||
#include "srslte/common/logger.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
|
||||
#include <stdint.h>
|
||||
#include "srslte/srslte.h"
|
||||
#include "common/pcap.h"
|
||||
#include "common/mac_pcap.h"
|
||||
#include "srslte/common/pcap.h"
|
||||
#include "srslte/common/mac_pcap.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "common/pdu.h"
|
||||
#include "srslte/common/pdu.h"
|
||||
#include "srslte/srslte.h"
|
||||
|
||||
// Table 6.1.3.1-1 Buffer size levels for BSR
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define Info(fmt, ...) log_h->info_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
#define Debug(fmt, ...) log_h->debug_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
|
||||
#include "common/pdu_queue.h"
|
||||
#include "srslte/common/pdu_queue.h"
|
||||
|
||||
|
||||
namespace srslte {
|
||||
|
|
|
@ -25,9 +25,9 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "common/security.h"
|
||||
#include "common/liblte_security.h"
|
||||
#include "common/snow_3g.h"
|
||||
#include "srslte/common/security.h"
|
||||
#include "srslte/common/liblte_security.h"
|
||||
#include "srslte/common/snow_3g.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
* Document 2: SNOW 3G Specification"
|
||||
*------------------------------------------------------------------------*/
|
||||
|
||||
#include "common/snow_3g.h"
|
||||
#include "srslte/common/snow_3g.h"
|
||||
|
||||
/* LFSR */
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "common/task_dispatcher.h"
|
||||
#include "srslte/common/task_dispatcher.h"
|
||||
#include <queue>
|
||||
|
||||
namespace srslte {
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include "common/thread_pool.h"
|
||||
#include "srslte/common/thread_pool.h"
|
||||
|
||||
#define DEBUG 0
|
||||
#define debug_thread(fmt, ...) do { if(DEBUG) printf(fmt, __VA_ARGS__); } while(0)
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "common/threads.h"
|
||||
#include "srslte/common/threads.h"
|
||||
|
||||
bool threads_new_rt(pthread_t *thread, void *(*start_routine) (void*), void *arg) {
|
||||
return threads_new_rt_prio(thread, start_routine, arg, -1);
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <pthread.h>
|
||||
|
||||
#include "common/tti_sync_cv.h"
|
||||
#include "srslte/common/tti_sync_cv.h"
|
||||
|
||||
|
||||
namespace srslte {
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
extern "C" {
|
||||
#include "srslte/phy/rf/rf.h"
|
||||
}
|
||||
#include "radio/radio.h"
|
||||
#include "srslte/radio/radio.h"
|
||||
#include <string.h>
|
||||
|
||||
namespace srslte {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#include "radio/radio_multi.h"
|
||||
#include "srslte/radio/radio_multi.h"
|
||||
|
||||
namespace srslte {
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "upper/gw.h"
|
||||
#include "srslte/upper/gw.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "upper/pdcp.h"
|
||||
#include "srslte/upper/pdcp.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "upper/pdcp_entity.h"
|
||||
#include "common/security.h"
|
||||
#include "srslte/upper/pdcp_entity.h"
|
||||
#include "srslte/common/security.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -25,10 +25,10 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "upper/rlc.h"
|
||||
#include "upper/rlc_tm.h"
|
||||
#include "upper/rlc_um.h"
|
||||
#include "upper/rlc_am.h"
|
||||
#include "srslte/upper/rlc.h"
|
||||
#include "srslte/upper/rlc_tm.h"
|
||||
#include "srslte/upper/rlc_um.h"
|
||||
#include "srslte/upper/rlc_am.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "upper/rlc_am.h"
|
||||
#include "srslte/upper/rlc_am.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "upper/rlc_entity.h"
|
||||
#include "srslte/upper/rlc_entity.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "upper/rlc_tm.h"
|
||||
#include "srslte/upper/rlc_tm.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "upper/rlc_um.h"
|
||||
#include "srslte/upper/rlc_um.h"
|
||||
|
||||
#define RX_MOD_BASE(x) (x-vr_uh-rx_window_size)%rx_mod
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include "common/bcd_helpers.h"
|
||||
#include "srslte/common/bcd_helpers.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#define NMSGS 100
|
||||
|
||||
#include <stdio.h>
|
||||
#include "common/log_filter.h"
|
||||
#include "srslte/common/log_filter.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include "common/logger.h"
|
||||
#include "srslte/common/logger.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#define NMSGS 1000000
|
||||
|
||||
#include <stdio.h>
|
||||
#include "common/msg_queue.h"
|
||||
#include "srslte/common/msg_queue.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <pthread.h>
|
||||
#include <stdio.h>
|
||||
#include "common/timeout.h"
|
||||
#include "srslte/common/timeout.h"
|
||||
|
||||
using namespace srslte;
|
||||
|
||||
|
|
|
@ -38,13 +38,6 @@ add_executable(rlc_um_test rlc_um_test.cc)
|
|||
target_link_libraries(rlc_um_test srslte_upper srslte_phy)
|
||||
add_test(rlc_um_test rlc_um_test)
|
||||
|
||||
add_executable(usim_test usim_test.cc)
|
||||
target_link_libraries(usim_test srslte_upper srslte_phy)
|
||||
add_test(usim_test usim_test)
|
||||
|
||||
add_executable(rrc_reconfig_test rrc_reconfig_test.cc)
|
||||
target_link_libraries(rrc_reconfig_test srslte_upper srslte_phy)
|
||||
add_test(rrc_reconfig_test rrc_reconfig_test)
|
||||
|
||||
########################################################################
|
||||
# Option to run command after build (useful for remote builds)
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
#include "upper/rlc_am.h"
|
||||
#include "srslte/upper/rlc_am.h"
|
||||
|
||||
// Simple status PDU
|
||||
uint8_t pdu1[] = {0x00, 0x78};
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
#include "upper/rlc_am.h"
|
||||
#include "srslte/upper/rlc_am.h"
|
||||
|
||||
// Fixed header only
|
||||
uint8_t pdu1[] = {0x88, 0x06};
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include "common/log_stdout.h"
|
||||
#include "upper/rlc_am.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include "srslte/upper/rlc_am.h"
|
||||
#include <assert.h>
|
||||
#define NBUFS 5
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include "upper/rlc_um.h"
|
||||
#include "srslte/upper/rlc_um.h"
|
||||
#include <assert.h>
|
||||
|
||||
// Fixed header only
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include "common/log_stdout.h"
|
||||
#include "upper/rlc_um.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include "srslte/upper/rlc_um.h"
|
||||
#include <assert.h>
|
||||
|
||||
#define NBUFS 5
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
#ifndef DEMUX_H
|
||||
#define DEMUX_H
|
||||
|
||||
#include "common/interfaces.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/pdu_queue.h"
|
||||
#include "common/log.h"
|
||||
#include "common/timers.h"
|
||||
#include "common/pdu.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/pdu_queue.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/timers.h"
|
||||
#include "srslte/common/pdu.h"
|
||||
|
||||
/* Logical Channel Demultiplexing and MAC CE dissassemble */
|
||||
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
#ifndef DL_HARQ_H
|
||||
#define DL_HARQ_H
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/timers.h"
|
||||
#include "mac/demux.h"
|
||||
#include "mac/dl_sps.h"
|
||||
#include "common/mac_pcap.h"
|
||||
#include "srslte/common/mac_pcap.h"
|
||||
|
||||
#include "common/mac_interface.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
|
||||
/* Downlink HARQ entity as defined in 5.3.2 of 36.321 */
|
||||
|
||||
|
|
|
@ -27,9 +27,9 @@
|
|||
#ifndef DL_SPS_H
|
||||
#define DL_SPS_H
|
||||
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/log.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/timers.h"
|
||||
|
||||
/* Downlink Semi-Persistent schedulign (Section 5.10.1) */
|
||||
|
||||
|
|
|
@ -27,10 +27,10 @@
|
|||
#ifndef MAC_H
|
||||
#define MAC_H
|
||||
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "mac/dl_harq.h"
|
||||
#include "mac/ul_harq.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/timers.h"
|
||||
#include "mac/mac_metrics.h"
|
||||
#include "mac/proc_ra.h"
|
||||
#include "mac/proc_sr.h"
|
||||
|
@ -38,11 +38,11 @@
|
|||
#include "mac/proc_phr.h"
|
||||
#include "mac/mux.h"
|
||||
#include "mac/demux.h"
|
||||
#include "common/mac_pcap.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/tti_sync_cv.h"
|
||||
#include "common/threads.h"
|
||||
#include "srslte/common/mac_pcap.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/tti_sync_cv.h"
|
||||
#include "srslte/common/threads.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -31,9 +31,9 @@
|
|||
|
||||
#include <vector>
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/pdu.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/pdu.h"
|
||||
#include "mac/proc_bsr.h"
|
||||
#include "mac/proc_phr.h"
|
||||
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/timers.h"
|
||||
|
||||
/* Buffer status report procedure */
|
||||
|
||||
|
|
|
@ -28,11 +28,11 @@
|
|||
#define PROCPHR_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "common/timers.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/timers.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/common/log.h"
|
||||
|
||||
#include "common/mac_interface.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
|
||||
/* Power headroom report procedure */
|
||||
|
||||
|
|
|
@ -29,12 +29,12 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/timers.h"
|
||||
#include "mac/mux.h"
|
||||
#include "mac/demux.h"
|
||||
#include "common/pdu.h"
|
||||
#include "common/mac_pcap.h"
|
||||
#include "srslte/common/pdu.h"
|
||||
#include "srslte/common/mac_pcap.h"
|
||||
|
||||
/* Random access procedure as specified in Section 5.1 of 36.321 */
|
||||
|
||||
|
|
|
@ -28,9 +28,9 @@
|
|||
#define PROCSR_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include "common/phy_interface.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/log.h"
|
||||
|
||||
/* Scheduling Request procedure as defined in 5.4.4 of 36.321 */
|
||||
|
||||
|
|
|
@ -27,12 +27,12 @@
|
|||
#ifndef ULHARQ_H
|
||||
#define ULHARQ_H
|
||||
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "mac/mux.h"
|
||||
#include "mac/ul_sps.h"
|
||||
#include "common/mac_pcap.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/mac_pcap.h"
|
||||
#include "srslte/common/timers.h"
|
||||
|
||||
/* Uplink HARQ entity as defined in 5.4.2 of 36.321 */
|
||||
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
#ifndef ULSPS_H
|
||||
#define ULSPS_H
|
||||
|
||||
#include "common/log.h"
|
||||
#include "common/timers.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/timers.h"
|
||||
|
||||
/* Uplink Semi-Persistent schedulign (Section 5.10.2) */
|
||||
|
||||
|
|
|
@ -31,10 +31,10 @@
|
|||
#include <string.h>
|
||||
#include <vector>
|
||||
#include "srslte/srslte.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "radio/radio.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/radio/radio.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "phy/phy_metrics.h"
|
||||
|
||||
//#define CONTINUOUS_TX
|
||||
|
|
|
@ -28,14 +28,14 @@
|
|||
#define UEPHYRECV_H
|
||||
|
||||
#include "srslte/srslte.h"
|
||||
#include "common/log.h"
|
||||
#include "common/threads.h"
|
||||
#include "common/thread_pool.h"
|
||||
#include "radio/radio_multi.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/threads.h"
|
||||
#include "srslte/common/thread_pool.h"
|
||||
#include "srslte/radio/radio_multi.h"
|
||||
#include "phy/prach.h"
|
||||
#include "phy/phch_worker.h"
|
||||
#include "phy/phch_common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -29,9 +29,9 @@
|
|||
|
||||
#include <string.h>
|
||||
#include "srslte/srslte.h"
|
||||
#include "common/thread_pool.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "common/trace.h"
|
||||
#include "srslte/common/thread_pool.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/common/trace.h"
|
||||
#include "phy/phch_common.h"
|
||||
|
||||
#define LOG_EXECTIME
|
||||
|
|
|
@ -28,18 +28,18 @@
|
|||
#define UEPHY_H
|
||||
|
||||
#include "srslte/srslte.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "phy/phy_metrics.h"
|
||||
#include "phy/phch_recv.h"
|
||||
#include "phy/prach.h"
|
||||
#include "phy/phch_worker.h"
|
||||
#include "phy/phch_common.h"
|
||||
#include "radio/radio.h"
|
||||
#include "common/task_dispatcher.h"
|
||||
#include "common/trace.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "srslte/radio/radio.h"
|
||||
#include "srslte/common/task_dispatcher.h"
|
||||
#include "srslte/common/trace.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -30,9 +30,9 @@
|
|||
#include <string.h>
|
||||
|
||||
#include "srslte/srslte.h"
|
||||
#include "radio/radio.h"
|
||||
#include "common/log.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "srslte/radio/radio.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -37,20 +37,20 @@
|
|||
#include <string>
|
||||
#include <pthread.h>
|
||||
|
||||
#include "radio/radio_multi.h"
|
||||
#include "srslte/radio/radio_multi.h"
|
||||
#include "phy/phy.h"
|
||||
#include "mac/mac.h"
|
||||
#include "upper/rlc.h"
|
||||
#include "upper/pdcp.h"
|
||||
#include "srslte/upper/rlc.h"
|
||||
#include "srslte/upper/pdcp.h"
|
||||
#include "upper/rrc.h"
|
||||
#include "upper/nas.h"
|
||||
#include "upper/gw.h"
|
||||
#include "srslte/upper/gw.h"
|
||||
#include "upper/usim.h"
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/logger.h"
|
||||
#include "common/log_filter.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/logger.h"
|
||||
#include "srslte/common/log_filter.h"
|
||||
|
||||
#include "ue_metrics_interface.h"
|
||||
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "upper/gw_metrics.h"
|
||||
#include "upper/rlc_metrics.h"
|
||||
#include "srslte/upper/gw_metrics.h"
|
||||
#include "srslte/upper/rlc_metrics.h"
|
||||
#include "mac/mac_metrics.h"
|
||||
#include "phy/phy_metrics.h"
|
||||
|
||||
|
|
|
@ -27,12 +27,12 @@
|
|||
#ifndef NAS_H
|
||||
#define NAS_H
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/security.h"
|
||||
#include "asn1/liblte_mme.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/security.h"
|
||||
#include "srslte/asn1/liblte_mme.h"
|
||||
|
||||
using srslte::byte_buffer_t;
|
||||
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
#include "pthread.h"
|
||||
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/security.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/security.h"
|
||||
|
||||
#include <map>
|
||||
|
|
@ -28,10 +28,10 @@
|
|||
#define USIM_H
|
||||
|
||||
#include <string>
|
||||
#include "common/log.h"
|
||||
#include "common/common.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "common/security.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
#include "srslte/common/security.h"
|
||||
|
||||
namespace srsue {
|
||||
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
add_subdirectory(phy)
|
||||
add_subdirectory(mac)
|
||||
add_subdirectory(upper)
|
||||
|
||||
if (RPATH)
|
||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
||||
|
@ -28,6 +29,7 @@ endif (RPATH)
|
|||
add_executable(ue main.cc ue.cc metrics_stdout.cc)
|
||||
target_link_libraries(ue srsue_mac
|
||||
srsue_phy
|
||||
srsue_upper
|
||||
srslte_common
|
||||
srslte_phy
|
||||
srslte_upper
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#include "mac/mac.h"
|
||||
#include "mac/demux.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
|
||||
namespace srsue {
|
||||
|
||||
|
|
|
@ -34,9 +34,9 @@
|
|||
#include <pthread.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "mac/mac.h"
|
||||
#include "common/pcap.h"
|
||||
#include "srslte/common/pcap.h"
|
||||
|
||||
|
||||
namespace srsue {
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include "mac/proc_phr.h"
|
||||
#include "mac/mac.h"
|
||||
#include "mac/mux.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
|
||||
|
||||
namespace srsue {
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#define Info(fmt, ...) log_h->info_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
#define Debug(fmt, ...) log_h->debug_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "mac/mac.h"
|
||||
#include "mac/ul_harq.h"
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <unistd.h>
|
||||
#include "srslte/srslte.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "phy/phch_worker.h"
|
||||
#include "phy/phch_common.h"
|
||||
#include "phy/phch_recv.h"
|
||||
|
|
|
@ -27,9 +27,9 @@
|
|||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include "phy/phch_worker.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "asn1/liblte_rrc.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/asn1/liblte_rrc.h"
|
||||
|
||||
#define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) phy->log_h->error_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
#define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) phy->log_h->warning_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
|
||||
#include "srslte/srslte.h"
|
||||
|
||||
#include "common/threads.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/threads.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "phy/phy.h"
|
||||
#include "phy/phch_worker.h"
|
||||
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
#include <pthread.h>
|
||||
|
||||
#include "srslte/srslte.h"
|
||||
#include "common/log.h"
|
||||
#include "srslte/common/log.h"
|
||||
#include "phy/prach.h"
|
||||
#include "phy/phy.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
|
||||
#define Error(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->error_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
#define Warning(fmt, ...) if (SRSLTE_DEBUG_ENABLED) log_h->warning_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
#
|
||||
# Copyright 2013-2017 Software Radio Systems Limited
|
||||
#
|
||||
# This file is part of srsLTE
|
||||
#
|
||||
# srsLTE is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# srsLTE is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# A copy of the GNU Affero General Public License can be found in
|
||||
# the LICENSE file in the top-level directory of this distribution
|
||||
# and at http://www.gnu.org/licenses/.
|
||||
#
|
||||
|
||||
file(GLOB SOURCES "*.cc")
|
||||
add_library(srsue_upper SHARED ${SOURCES})
|
|
@ -30,8 +30,8 @@
|
|||
|
||||
#include "upper/rrc.h"
|
||||
#include <srslte/phy/utils/bit.h>
|
||||
#include "common/security.h"
|
||||
#include "common/bcd_helpers.h"
|
||||
#include "srslte/common/security.h"
|
||||
#include "srslte/common/bcd_helpers.h"
|
||||
|
||||
#define TIMEOUT_RESYNC_REESTABLISH 100
|
||||
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include "asn1/liblte_rrc.h"
|
||||
#include "radio/radio_multi.h"
|
||||
#include "srslte/asn1/liblte_rrc.h"
|
||||
#include "srslte/radio/radio_multi.h"
|
||||
#include "phy/phy.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "common/log_stdout.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include "mac/mac.h"
|
||||
#include "common/mac_pcap.h"
|
||||
#include "srslte/common/mac_pcap.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -28,9 +28,9 @@
|
|||
|
||||
#include "srslte/phy/utils/debug.h"
|
||||
#include "phy/phy.h"
|
||||
#include "common/phy_interface.h"
|
||||
#include "common/log_stdout.h"
|
||||
#include "radio/radio_multi.h"
|
||||
#include "srslte/common/phy_interface.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include "srslte/radio/radio_multi.h"
|
||||
|
||||
/**********************************************************************
|
||||
* Program arguments processing
|
||||
|
|
|
@ -28,9 +28,9 @@
|
|||
|
||||
#include "srslte/phy/utils/debug.h"
|
||||
#include "phy/phy.h"
|
||||
#include "common/log_stdout.h"
|
||||
#include "common/mac_interface.h"
|
||||
#include "radio/radio_multi.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include "srslte/common/mac_interface.h"
|
||||
#include "srslte/radio/radio_multi.h"
|
||||
|
||||
|
||||
/**********************************************************************
|
||||
|
|
|
@ -31,6 +31,15 @@ target_link_libraries(ip_test srsue_mac
|
|||
${CMAKE_THREAD_LIBS_INIT}
|
||||
${Boost_LIBRARIES})
|
||||
|
||||
add_executable(usim_test usim_test.cc)
|
||||
target_link_libraries(usim_test srsue_upper srslte_upper srslte_phy)
|
||||
add_test(usim_test usim_test)
|
||||
|
||||
add_executable(rrc_reconfig_test rrc_reconfig_test.cc)
|
||||
target_link_libraries(rrc_reconfig_test srsue_upper srslte_upper srslte_phy)
|
||||
add_test(rrc_reconfig_test rrc_reconfig_test)
|
||||
|
||||
|
||||
########################################################################
|
||||
# Option to run command after build (useful for remote builds)
|
||||
########################################################################
|
||||
|
|
|
@ -18,14 +18,14 @@
|
|||
#include "srslte/phy/utils/debug.h"
|
||||
#include "mac/mac.h"
|
||||
#include "phy/phy.h"
|
||||
#include "common/threads.h"
|
||||
#include "common/common.h"
|
||||
#include "common/buffer_pool.h"
|
||||
#include "common/logger.h"
|
||||
#include "common/log_filter.h"
|
||||
#include "upper/rlc.h"
|
||||
#include "srslte/common/threads.h"
|
||||
#include "srslte/common/common.h"
|
||||
#include "srslte/common/buffer_pool.h"
|
||||
#include "srslte/common/logger.h"
|
||||
#include "srslte/common/log_filter.h"
|
||||
#include "srslte/upper/rlc.h"
|
||||
#include "upper/rrc.h"
|
||||
#include "radio/radio_multi.h"
|
||||
#include "srslte/radio/radio_multi.h"
|
||||
|
||||
#define START_TUNTAP
|
||||
#define USE_RADIO
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
#include <iostream>
|
||||
#include "upper/usim.h"
|
||||
#include "upper/nas.h"
|
||||
#include "upper/rlc.h"
|
||||
#include "srslte/upper/rlc.h"
|
||||
#include "upper/rrc.h"
|
||||
#include "mac/mac.h"
|
||||
#include "upper/pdcp_entity.h"
|
||||
#include "upper/pdcp.h"
|
||||
#include "common/log_stdout.h"
|
||||
#include "common/interfaces.h"
|
||||
#include "srslte/upper/pdcp_entity.h"
|
||||
#include "srslte/upper/pdcp.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include "srslte/common/interfaces.h"
|
||||
|
||||
using namespace srsue;
|
||||
|
|
@ -26,9 +26,9 @@
|
|||
|
||||
#include <iostream>
|
||||
#include <srslte/srslte.h>
|
||||
#include "common/log_stdout.h"
|
||||
#include "asn1/liblte_rrc.h"
|
||||
#include "asn1/liblte_mme.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include "srslte/asn1/liblte_rrc.h"
|
||||
#include "srslte/asn1/liblte_mme.h"
|
||||
|
||||
void nas_test() {
|
||||
srslte::log_stdout log1("NAS");
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <iostream>
|
||||
#include "upper/usim.h"
|
||||
#include "common/log_stdout.h"
|
||||
#include "srslte/common/log_stdout.h"
|
||||
#include <assert.h>
|
||||
|
||||
using namespace srsue;
|
Loading…
Reference in New Issue