diff --git a/targets/Makerules b/targets/Makerules index a6532c9337ea63fbedf085f20c550a8f018c7ec0..42fb88f6f59275964ea6966a024e9e0560611712 100644 --- a/targets/Makerules +++ b/targets/Makerules @@ -66,4 +66,4 @@ S1AP_OBJ_DIR = $(subst $(OPENAIR_HOME),$(OBJS_DIR),$(S1AP_DIR)) SCTP_OBJ_DIR = $(subst $(OPENAIR_HOME),$(OBJS_DIR),$(SCTP_DIR)) export S1AP_DIR -export COMMON_UTILS_DIR \ No newline at end of file +export COMMON_UTILS_DIR diff --git a/targets/RTAI/USER/Makefile b/targets/RTAI/USER/Makefile index e7748090df981f26ea6764c4d3f06209c4a6348e..ec0055b51eca37692cd7644351496f7752b1daed 100644 --- a/targets/RTAI/USER/Makefile +++ b/targets/RTAI/USER/Makefile @@ -158,6 +158,7 @@ endif ifeq ($(USRP),1) CFLAGS += -I/opt/uhd/include -L/opt/uhd/lib -luhd -lpthread -lstdc++ +CFLAGS += -DUSRP endif #CFLAGS += -I/usr/include/c++/4.6 -I/usr/include/c++/4.6/x86_64-linux-gnu -I/usr/include/rtai/ diff --git a/targets/RTAI/USER/lte-softmodem-usrp.c b/targets/RTAI/USER/lte-softmodem-usrp.c index 20e7c07b0c89109a577cc0a0a6798df852850ecd..f1159c421e70d191aadc75922f6c4ce44ac5a41d 100644 --- a/targets/RTAI/USER/lte-softmodem-usrp.c +++ b/targets/RTAI/USER/lte-softmodem-usrp.c @@ -419,7 +419,7 @@ static void *eNB_thread(void *arg) // -- PHY procedure -- { //phy_procedures_eNB_lte(last_slot, next_slot, PHY_vars_eNB_g[0], 0);//for OAI version berfore 4160 - phy_procedures_eNB_lte(last_slot, next_slot, PHY_vars_eNB_g[0], 0,0,NULL); + phy_procedures_eNB_lte(last_slot, next_slot, PHY_vars_eNB_g[0], 0,0,NULL); #ifndef IFFT_FPGA slot_offset_F = (next_slot)* (PHY_vars_eNB_g[0]->lte_frame_parms.ofdm_symbol_size)* diff --git a/targets/RTAI/USER/make_for_usrp.sh b/targets/RTAI/USER/make_for_usrp.sh index fcfc3f6914d61b9178c2f00997b88148efe8037e..998cd7c462d5a0f4a66926d5d4890509c0b21050 100755 --- a/targets/RTAI/USER/make_for_usrp.sh +++ b/targets/RTAI/USER/make_for_usrp.sh @@ -1,36 +1,36 @@ -#!/bin/bash - -############### make nasmesh.ko ############### -sudo rmmod nasmesh -#cd ${OPENAIR2_DIR} && make nasmesh_netlink.ko -#cd ${OPENAIR2_DIR}/NAS/DRIVER/MESH/RB_TOOL/ && make -#make all -sudo insmod $OPENAIR2_DIR/NAS/DRIVER/MESH/nasmesh.ko - -############## Ethernet config #################### -sudo ifconfig eth0 mtu 4000 -sudo sysctl -w net.core.wmem_max=1048576 -sudo sysctl -w net.core.rmem_max=50000000 - -############## rtai modules ################### -if test \! -c /dev/rtai_shm; then - sudo mknod -m 666 /dev/rtai_shm c 10 254 -fi -for n in `seq 0 9`; do - f=/dev/rtf$n - if test \! -c $f; then - sudo mknod -m 666 $f c 150 $n - fi -done -sudo modprobe rtai_hal -sudo modprobe rtai_sched -sudo modprobe rtai_fifos -sudo modprobe rtai_sem -sudo modprobe rtai_mbx -sudo modprobe rtai_msg - -############## make ################### -make lte-softmodem-usrp NAS=1 USRP=1 XFORMS=1 RTAI=1 HARD_RT=1 #DRIVER2013=1 -#make lte-softmodem NAS=1 XFORMS=1 USRP=0 RTAI=1 DRIVER2013=1 -echo DONE! -exit 0 +#!/bin/bash + +############### make nasmesh.ko ############### +sudo rmmod nasmesh +#cd ${OPENAIR2_DIR} && make nasmesh_netlink.ko +#cd ${OPENAIR2_DIR}/NAS/DRIVER/MESH/RB_TOOL/ && make +#make all +sudo insmod $OPENAIR2_DIR/NAS/DRIVER/MESH/nasmesh.ko + +############## Ethernet config #################### +sudo ifconfig eth0 mtu 4000 +sudo sysctl -w net.core.wmem_max=1048576 +sudo sysctl -w net.core.rmem_max=50000000 + +############## rtai modules ################### +if test \! -c /dev/rtai_shm; then + sudo mknod -m 666 /dev/rtai_shm c 10 254 +fi +for n in `seq 0 9`; do + f=/dev/rtf$n + if test \! -c $f; then + sudo mknod -m 666 $f c 150 $n + fi +done +sudo modprobe rtai_hal +sudo modprobe rtai_sched +sudo modprobe rtai_fifos +sudo modprobe rtai_sem +sudo modprobe rtai_mbx +sudo modprobe rtai_msg + +############## make ################### +make lte-softmodem-usrp NAS=1 USRP=1 XFORMS=1 RTAI=1 HARD_RT=1 #DRIVER2013=1 +#make lte-softmodem NAS=1 XFORMS=1 USRP=0 RTAI=1 DRIVER2013=1 +echo DONE! +exit 0