minor update

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4560 818b1a75-f10b-46b9-bf7c-635c3b92a50f

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

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/
 

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)*

targets/RTAI/USER/make_for_usrp.sh

-#!/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