maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rename_sdr_radio' into integration_2022_wk42b

Browse Source
This commit is contained in:
Robert Schmidt
2022-10-20 15:00:12 +02:00
parent 8a290ece2a e79b926905
commit 79857ec8e6
82 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/DOCS/Doxyfile
+5 -5
View File
@@ -792,11 +792,11 @@ INPUT = $(OPENAIR1_DIR)/PHY/defs.h \
$(OPENAIR2_DIR)/LAYER2/RLC/UM_v9.3.0/rlc_um.h \
$(OPENAIR2_DIR)/LAYER2/RLC/UM_v9.3.0/rlc_um_entity.h \
$(OPENAIR2_DIR)/NETWORK_DRIVER/MESH/proto_extern.h \
$(OPENAIR_DIR)/sdr/COMMON/common_lib.h \
$(OPENAIR_DIR)/sdr/USRP/USERSPACE/LIB/usrp_lib.cpp \
$(OPENAIR_DIR)/sdr/BLADERF/USERSPACE/LIB/bladerf_lib.c \
$(OPENAIR_DIR)/sdr/BLADERF/USERSPACE/LIB/bladerf_lib.h \
$(OPENAIR_DIR)/sdr/LMSSDR/USERSPACE/LIB/lms_lib.cpp
$(OPENAIR_DIR)/radio/COMMON/common_lib.h \
$(OPENAIR_DIR)/radio/USRP/USERSPACE/LIB/usrp_lib.cpp \
$(OPENAIR_DIR)/radio/BLADERF/USERSPACE/LIB/bladerf_lib.c \
$(OPENAIR_DIR)/radio/BLADERF/USERSPACE/LIB/bladerf_lib.h \
$(OPENAIR_DIR)/radio/LMSSDR/USERSPACE/LIB/lms_lib.cpp
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
targets/RT/USER/lte-enb.c
+1 -1
View File
@@ -62,7 +62,7 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
#include "sdr/COMMON/common_lib.h"
#include "radio/COMMON/common_lib.h"
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
targets/RT/USER/lte-ru.c
+2 -2
View File
@@ -58,8 +58,8 @@
#include "SCHED/sched_common.h"
#include "common/utils/LOG/log.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "sdr/COMMON/common_lib.h"
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
#include "radio/COMMON/common_lib.h"
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
/* these variables have to be defined before including ENB_APP/enb_paramdef.h */
static int DEFBANDS[] = {7};
targets/RT/USER/lte-softmodem.c
+2 -2
View File
@@ -47,8 +47,8 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
#include "sdr/COMMON/common_lib.h"
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
#include "radio/COMMON/common_lib.h"
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
targets/RT/USER/lte-softmodem.h
+1 -1
View File
@@ -19,7 +19,7 @@
#include <sys/sysinfo.h>
#include <sys/types.h>
#include <unistd.h>
#include "sdr/COMMON/common_lib.h"
#include "radio/COMMON/common_lib.h"
//#undef MALLOC
#include "assertions.h"
#include "PHY/types.h"
targets/RT/USER/lte-uesoftmodem.c
+2 -2
View File
@@ -47,8 +47,8 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
#include "sdr/COMMON/common_lib.h"
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
#include "radio/COMMON/common_lib.h"
#include "radio/ETHERNET/USERSPACE/LIB/if_defs.h"
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
targets/RT/USER/ru_control.c
+2 -2
View File
@@ -53,8 +53,8 @@
#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
#include "sdr/COMMON/common_lib.h"
#include "sdr/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
#include "radio/COMMON/common_lib.h"
#include "radio/ETHERNET/USERSPACE/LIB/ethernet_lib.h"
#include "PHY/LTE_TRANSPORT/if4_tools.h"