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

Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed

Browse Source
This commit is contained in:
bruno mongazon
2018-01-15 18:47:07 +01:00
parent afcc9aabd8
commit cf0e9175dd
150 changed files with 45 additions and 23495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/LTE_PHY/Makefile
-202
View File
@@ -1,202 +0,0 @@
include $(OPENAIR_DIR)/common/utils/Makefile.inc
COMMON_UTILS_DIR = $(OPENAIR_DIR)/common/utils
TOP_DIR = $(OPENAIR1_DIR)
OPENAIR1_TOP = $(OPENAIR1_DIR)
OPENAIR2_TOP = $(OPENAIR2_DIR)
OPENAIR3 = $(OPENAIR3_DIR)
CFLAGS += -DMAX_NUM_CCs=1 -Wall -DPHYSIM -DNODE_RG -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -DPHY_CONTEXT=1 -DMALLOC_CHECK_=1 -DENABLE_VCD_FIFO -DLOG_NO_THREAD # -Wno-packed-bitfield-compat
# enable C99 mode
CFLAGS += -std=gnu99
# DCI Debug
# CFLAGS += -DDEBUG_DCI_ENCODING
# TODO: only for framegen
#CFLAGS += -DOPENAIR2
#CFLAGS += -DDEBUG_PHY_PROC
#CFLAGS += -DDEBUG_GROUPHOP
ifdef OMP
CFLAGS += -DOMP -fopenmp
endif
ifdef LLR8
CFLAGS += -DLLR8
endif
CFLAGS += -DNEW_FFT
LFLAGS = -lm -lblas -lxml2 -lrt -lpthread $(LFDS_DIR)/bin/liblfds611.a
ifdef GPIB
LFLAGS += -lgpib
endif
CFLAGS += -DOPENAIR_LTE #-DOFDMA_ULSCH #-DIFFT_FPGA -DIFFT_FPGA_UE
#CFLAGS += -DTBS_FIX
CFLAGS += -DCELLULAR
ASN1_MSG_INC = $(OPENAIR2_DIR)/RRC/LITE/MESSAGES
ifdef EMOS
CFLAGS += -DEMOS
endif
ifdef DEBUG_PHY
CFLAGS += -DDEBUG_PHY
endif
ifdef MeNBMUE
CFLAGS += -DMeNBMUE
endif
ifdef MU_RECEIVER
CFLAGS += -DMU_RECEIVER
endif
ifdef ZBF_ENABLED
CFLAGS += -DNULL_SHAPE_BF_ENABLED
endif
ifdef RANDOM_BF
CFLAGS += -DRANDOM_BF
endif
ifdef PBS_SIM
CFLAGS += -DPBS_SIM
endif
ifdef XFORMS
CFLAGS += -DXFORMS
LFLAGS += -lforms
endif
ifdef SMBV
CFLAGS += -DSMBV
endif
ifdef PERFECT_CE
CFLAGS += -DPERFECT_CE
endif
ifdef BIT8_TX
CFLAGS += -DBIT8_TX
endif
CFLAGS += -DNO_RRM -DOPENAIR1 -DPHY_ABSTRACTION #-DOPENAIR2
CFLAGS += -I/usr/include/X11 -I/usr/X11R6/include
ifdef RTAI
CFLAGS += -DRTAI_ENABLED -D__IN_RTAI__ $(shell rtai-config --lxrt-cflags)
LFLAGS += $(shell rtai-config --lxrt-ldflags) -llxrt
endif
include $(COMMON_UTILS_DIR)/Makefile.inc
include $(TOP_DIR)/PHY/Makefile.inc
include $(TOP_DIR)/SCHED/Makefile.inc
include $(TOP_DIR)/SIMULATION/Makefile.inc
include $(OPENAIR2_DIR)/LAYER2/Makefile.inc
include $(OPENAIR2_DIR)/UTIL/Makefile.inc
include $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc
#LOG_OBJS += $(LOG_DIR)/vcd_signal_dumper.o
CFLAGS += $(L2_incl) -I$(ASN1_MSG_INC) -I$(TOP_DIR) -I$(OPENAIR2_DIR) -I$(OPENAIR3) $(UTIL_incl) $(UTILS_incl)
# EXTRA_CFLAGS =
#STATS_OBJS += $(TOP_DIR)/ARCH/CBMIMO1/DEVICE_DRIVER/cbmimo1_proc.o
#LAYER2_OBJ += $(OPENAIR2_DIR)/LAYER2/MAC/rar_tools.o
#LAYER2_OBJ = $(OPENAIR2_DIR)/LAYER2/MAC/lte_transport_init.o
OBJ = $(PHY_OBJS) $(SIMULATION_OBJS) $(TOOLS_OBJS) $(SCHED_OBJS) $(LAYER2_OBJ) $(LOG_OBJS) $(ITTI_DIR)/backtrace.o
ifdef GPIB
OBJ += LTE_Configuration.o
endif
#OBJ2 = $(PHY_OBJS) $(SIMULATION_OBJS) $(TOOLS_OBJS)
ifdef XFORMS
OBJ += $(OPENAIR1_DIR)/PHY/TOOLS/lte_phy_scope.o
endif
ifdef STATIC
LFLAGS += -static -L/usr/lib/libblas
endif
all: dlsim pbchsim pdcchsim ulsim pucchsim prachsim mbmssim scansim
$(LFDS_DIR)/bin/liblfds611.a:
$(MAKE) -C $(LFDS_DIR) -f makefile.linux
test: $(SIMULATION_OBJS) $(TOOLS_OBJS) $(TOP_DIR)/PHY/INIT/lte_init.o test.c
$(CC) test.c -I$(TOP_DIR) -o test $(CFLAGS) $(SIMULATION_OBJS) $(TOOLS_OBJS) -lm
OBJ += $(LIST_OBJ)
OBJ += $(MEM_OBJ)
$(OBJ) : %.o : %.c
@echo Compiling $< ...
@$(CC) -c $(CFLAGS) -o $@ $<
dlsim : $(OBJ) dlsim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling dlsim.c ..."
@$(CC) dlsim.c -o dlsim $(CFLAGS) $(OBJ) $(LFLAGS)
dlsim2 : $(OBJ) dlsim2.c
@echo "Compiling dlsim2.c ..."
@$(CC) dlsim2.c -o dlsim2 $(CFLAGS) $(OBJ) $(LFLAGS)
framegen: $(OBJ) framegen.c
@echo "Compiling framegen.c"
@$(CC) framegen.c -o framegen $(CFLAGS) $(OBJ) $(LFLAGS)
pbchsim : $(OBJ) pbchsim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling pbchsim.c"
@$(CC) pbchsim.c -o pbchsim $(CFLAGS) $(OBJ) $(LFLAGS)
scansim : $(OBJ) scansim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling scansim.c"
@$(CC) scansim.c -o scansim $(CFLAGS) $(OBJ) $(LFLAGS)
mbmssim : $(OBJ) mbmssim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling mbmssim.c"
@$(CC) mbmssim.c -o mbmssim $(CFLAGS) $(OBJ) $(LFLAGS)
pdcchsim : $(OBJ) pdcchsim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling pdcchsim.c"
@$(CC) pdcchsim.c -o pdcchsim $(CFLAGS) $(OBJ) $(LFLAGS)
pucchsim : $(OBJ) pucchsim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling pucchsim.c"
@$(CC) pucchsim.c -o pucchsim $(CFLAGS) $(OBJ) $(LFLAGS)
prachsim : $(OBJ) prachsim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling prachsim.c"
@$(CC) prachsim.c -o prachsim $(CFLAGS) $(OBJ) $(LFLAGS)
ulsim : $(OBJ) ulsim.c $(LFDS_DIR)/bin/liblfds611.a #ulsim_form.c
@echo "Compiling [ulsim.c]"
@$(CC) ulsim.c -o ulsim $(CFLAGS) $(OBJ) $(LFLAGS)
syncsim : $(OBJ) syncsim.c $(LFDS_DIR)/bin/liblfds611.a
@echo "Compiling syncsim.c"
@$(CC) syncsim.c -o syncsim $(CFLAGS) $(OBJ) $(LFLAGS)
clean :
rm -f $(OBJ)
rm -f *.o
cleanall : clean
rm -f dlsim pbchsim pdcchsim ulsim pucchsim mbmssim prachsim
rm -f *.exe*
showflags :
@echo $(CFLAGS)
@echo $(LFLAGS)
showobj:
@echo $(SCHED_OBJS)
cppcheck:
@echo "cppcheck ..."
cppcheck $(INCLUDES) ${OBJ:.o=.c} ${OAISIM_OBJS,.o=.c} ${ASN1_RRC_MSG_OBJS1,.o=.c}
openair1/SIMULATION/LTE_PHY/mbmssim.c
-3
View File
@@ -31,9 +31,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "LAYER2/MAC/vars.h"
openair1/SIMULATION/LTE_PHY/pbchsim.c
-6
View File
@@ -32,9 +32,6 @@
#include "PHY/defs.h"
#include "PHY/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "LAYER2/MAC/vars.h"
@@ -91,9 +88,6 @@ int main(int argc, char **argv)
uint8_t extended_prefix_flag=0;
int8_t interf1=-21,interf2=-21;
LTE_DL_FRAME_PARMS *frame_parms;
#ifdef EMOS
fifo_dump_emos emos_dump;
#endif
FILE *input_fd=NULL,*pbch_file_fd=NULL;
char input_val_str[50],input_val_str2[50];
openair1/SIMULATION/LTE_PHY/pdcchsim.c
-3
View File
@@ -28,9 +28,6 @@
#include "PHY/defs.h"
#include "PHY/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "LAYER2/MAC/vars.h"
openair1/SIMULATION/LTE_PHY/prachsim.c
-7
View File
@@ -27,9 +27,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "LAYER2/MAC/vars.h"
@@ -76,10 +73,6 @@ int main(int argc, char **argv)
uint8_t extended_prefix_flag=0;
// int8_t interf1=-19,interf2=-19;
LTE_DL_FRAME_PARMS *frame_parms;
#ifdef EMOS
fifo_dump_emos emos_dump;
#endif
SCM_t channel_model=Rayleigh1;
openair1/SIMULATION/LTE_PHY/pucchsim.c
-6
View File
@@ -27,9 +27,6 @@
#include "PHY/types.h"
#include "PHY/defs.h"
#include "PHY/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "LAYER2/MAC/vars.h"
@@ -77,9 +74,6 @@ int main(int argc, char **argv)
uint8_t extended_prefix_flag=0;
LTE_DL_FRAME_PARMS *frame_parms;
#ifdef EMOS
fifo_dump_emos emos_dump;
#endif
SCM_t channel_model=Rayleigh1_corr;
openair1/SIMULATION/LTE_PHY/scansim.c
-6
View File
@@ -33,9 +33,6 @@
#include "PHY/vars.h"
#include "MAC_INTERFACE/vars.h"
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "LAYER2/MAC/vars.h"
@@ -91,9 +88,6 @@ int main(int argc, char **argv)
uint32_t nsymb,tx_lev,tx_lev1,tx_lev2;
uint8_t extended_prefix_flag=0;
LTE_DL_FRAME_PARMS *frame_parms;
#ifdef EMOS
fifo_dump_emos emos_dump;
#endif
FILE *input_fd=NULL,*pbch_file_fd=NULL;
char input_val_str[50],input_val_str2[50];
openair1/SIMULATION/LTE_PHY/syncsim.c
-45
View File
@@ -30,11 +30,6 @@
#include <sys/ioctl.h>
#include <sys/mman.h>
#ifdef RTAI_ENABLED
#include <rtai_mbx.h>
#include <rtai_msg.h>
#endif
#include "SIMULATION/TOOLS/defs.h"
#include "SIMULATION/RF/defs.h"
#include "PHY/types.h"
@@ -44,9 +39,6 @@
#ifdef IFFT_FPGA
#include "PHY/LTE_REFSIG/mod_table.h"
#endif
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#include "SCHED/defs.h"
#include "SCHED/vars.h"
#include "ARCH/CBMIMO1/DEVICE_DRIVER/vars.h"
@@ -381,9 +373,6 @@ int main(int argc, char **argv)
uint8_t extended_prefix_flag=0,frame_type=1;
int8_t interf1=-21,interf2=-21;
LTE_DL_FRAME_PARMS *frame_parms;
#ifdef EMOS
fifo_dump_emos emos_dump;
#endif
FILE *input_fd=NULL,*pbch_file_fd=NULL;
char input_val_str[50],input_val_str2[50];
@@ -430,13 +419,6 @@ int main(int argc, char **argv)
int rx_offset_mod;
#ifdef RTAI_ENABLED
int period;
RTIME expected;
RT_TASK *task;
#define PERIOD 1000000000
#endif
logInit();
number_of_cards = 1;
@@ -694,23 +676,6 @@ int main(int argc, char **argv)
}
}
#ifdef RTAI_ENABLED
if (!(task = rt_task_init_schmod(nam2num("SYNCSIM"), 0, 0, 0, SCHED_FIFO, 0xF))) {
printf("CANNOT INIT MASTER TASK\n");
exit(1);
}
rt_set_periodic_mode();
period = start_rt_timer(nano2count(PERIOD));
mlockall(MCL_CURRENT | MCL_FUTURE);
rt_make_hard_real_time();
rt_task_make_periodic(task, expected = rt_get_time() + 10*period, period);
#endif
#ifdef XFORMS
if (do_forms==1) {
@@ -1374,11 +1339,6 @@ int main(int argc, char **argv)
for (trial=0; trial<n_frames; trial++) {
#ifdef RTAI_ENABLED
ret = rt_task_wait_period();
printf("rt_task_wait_period() returns %d, time %llu\n",ret, rt_get_time());
#endif
if (oai_hw_input == 0) {
if (awgn_flag == 0) {
@@ -1752,11 +1712,6 @@ int main(int argc, char **argv)
ioctl(openair_fd,openair_START_TX_SIG,(void *)NULL);
}
#ifdef RTAI_ENABLED
rt_make_soft_real_time();
rt_task_delete(task);
#endif
#ifdef XFORMS
if (do_forms==1) {
openair1/SIMULATION/LTE_PHY/ulsim2.c
-9
View File
@@ -30,9 +30,6 @@
#ifdef IFFT_FPGA
#include "PHY/LTE_REFSIG/mod_table.h"
#endif
#ifdef EMOS
#include "SCHED/phy_procedures_emos.h"
#endif
#define BW 10.0
#define Td 1.0
@@ -69,12 +66,6 @@ int main(int argc, char **argv)
double ip =0.0;
double N0W, path_loss, path_loss_dB;
#ifdef EMOS
fifo_dump_emos emos_dump;
#endif
if (argc>1)
sigma2_dB = atoi(argv[1]);
openair1/SIMULATION/TOOLS/taus.c
-5
View File
@@ -21,11 +21,6 @@
#include <time.h>
#include <stdlib.h>
#ifdef RTAI_ENABLED
#include <rtai.h>
#include <rtai_sched.h>
#define time(x) (unsigned int)(rt_get_time_ns())
#endif
unsigned int s0, s1, s2, b;