From 7c40342151ac67f52b5d986601b57deb92117e79 Mon Sep 17 00:00:00 2001
From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr>
Date: Tue, 22 Oct 2013 12:44:45 +0000
Subject: [PATCH] RTAI/USER/Makefile changed such that both lte-softmodem and
 lte-softmodem-usrp compile without RTAI (for pre-ci testing)

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4256 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 targets/RTAI/USER/Makefile             | 37 +++++++++++++++-----------
 targets/RTAI/USER/lte-softmodem-usrp.c | 13 ++++-----
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/targets/RTAI/USER/Makefile b/targets/RTAI/USER/Makefile
index 260078a75f..1a090e8860 100644
--- a/targets/RTAI/USER/Makefile
+++ b/targets/RTAI/USER/Makefile
@@ -18,35 +18,41 @@ ifndef RTAI
 RTAI=1
 endif
 
+ifndef USRP
+USRP=0
+endif
+
 ifeq ($(RTAI),1)
 CFLAGS += -DENABLE_RTAI_CLOCK
 CFLAGS += -DCONFIG_RTAI_LXRT_INLINE  #remend the RTAI warning
 #RTAI_OBJ = sched_dlsch.o sched_ulsch.o sched_rx_pdsch.o lte-softmodem.o rt_wrapper.o 
 RTAI_OBJ = sched_dlsch.o sched_ulsch.o sched_rx_pdsch.o rt_wrapper.o 
+ifeq ($(USRP),1)
+RTAI_OBJ += lte-softmodem-usrp.o
+else
+RTAI_OBJ += lte-softmodem.o
+endif
 else
 #OBJ = sched_dlsch.o sched_ulsch.o sched_rx_pdsch.o lte-softmodem.o rt_wrapper.o
 OBJ = sched_dlsch.o sched_ulsch.o sched_rx_pdsch.o rt_wrapper.o
+ifeq ($(USRP),1)
+OBJ += lte-softmodem-usrp.o
+else
+OBJ += lte-softmodem.o
+endif
 CFLAGS += -DENABLE_USE_CPU_EXECUTION_TIME
 endif
 
 OBJ += $(OPENAIR1_DIR)/SIMULATION/TOOLS/taus.o $(OPENAIR_TARGETS)/SIMU/USER/init_lte.o #$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.o
 
-ifndef USRP
-USRP=1
-endif
-
 ifeq ($(USRP),1)
 include $(OPENAIR_TARGETS)/ARCH/USRP/USERSPACE/LIB/Makefile.inc
-RTAI_OBJ += lte-softmodem-usrp.o
-OBJ += $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.o
-CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
-else
-RTAI_OBJ += lte-softmodem.o
-OBJ += $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.o
-#CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS
-CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
 endif
 
+OBJ += $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.o
+CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
+
+
 TOP_DIR = $(OPENAIR1_DIR)
 include $(OPENAIR1_DIR)/PHY/Makefile.inc
 include $(OPENAIR1_DIR)/SCHED/Makefile.inc
@@ -148,7 +154,7 @@ OBJ += $(NAS_OBJS)
 endif
 
 RTAI_CFLAGS += $(shell rtai-config --lxrt-cflags) -DRTAI
-LDFLAGS += -lpthread -lm -lforms -llxrt
+LDFLAGS += -lpthread -lm -lforms
 ifeq ($(RTAI),1)
 LDFLAGS += $(shell rtai-config --lxrt-ldflags) 
 else
@@ -158,7 +164,7 @@ endif
 ifeq ($(USRP),1)
 CFLAGS += -I/opt/uhd/include -L/opt/uhd/lib -luhd -lpthread -lstdc++
 endif
-CFLAGS += -I/usr/include/c++/4.6 -I/usr/include/c++/4.6/x86_64-linux-gnu -I/usr/include/rtai/
+#CFLAGS += -I/usr/include/c++/4.6 -I/usr/include/c++/4.6/x86_64-linux-gnu -I/usr/include/rtai/
 
 all: lte-softmodem
 
@@ -308,7 +314,8 @@ cleanall: clean cleanasn1
 show:
 	@echo $(CFLAGS)
 	@echo $(EXTRA_CFLAGS)
-	@echo $(OBJ) $(RTAI_OBJ)
+	@echo $(OBJ) $(RTAI_OBJ) 
+	@echo $(USRP_OBJ)
 	@echo rrc_cellular variable is $(rrc_cellular)
 	@echo eNB_flag is $(eNB_flag)
 	@echo UE_flag is $(UE_flag)
diff --git a/targets/RTAI/USER/lte-softmodem-usrp.c b/targets/RTAI/USER/lte-softmodem-usrp.c
index 7427c2bafc..173dda2ef1 100644
--- a/targets/RTAI/USER/lte-softmodem-usrp.c
+++ b/targets/RTAI/USER/lte-softmodem-usrp.c
@@ -41,6 +41,7 @@ Address      : Eurecom, 2229, route des crêtes, 06560 Valbonne Sophia Antipolis
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <time.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -96,14 +97,14 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "UTIL/MATH/oml.h"
 #include "UTIL/LOG/vcd_signal_dumper.h"
 
-#ifdef XFORMS
-#include "PHY/TOOLS/lte_phy_scope.h"
-#include "stats.h"
 
+#include "stats.h"
 #include "../../ARCH/USRP/USERSPACE/LIB/def.h"
 #include "TOOLS/thread_ipc.c"
 
-#include <time.h>
+
+#ifdef XFORMS
+#include "PHY/TOOLS/lte_phy_scope.h"
 
 // current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
 // at eNB 0, an UL scope for every UE
@@ -418,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);
+			  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)*
@@ -613,7 +614,7 @@ static void *UE_thread(void *arg)
 			PHY_vars_UE_g[0]->frame = frame;
 
 			//phy_procedures_UE_lte (last_slot, next_slot, PHY_vars_UE_g[0], 0, 0,mode);//for OAI version after 4160
-			phy_procedures_UE_lte (last_slot, next_slot, PHY_vars_UE_g[0], 0, 0,mode,0);
+			phy_procedures_UE_lte (last_slot, next_slot, PHY_vars_UE_g[0], 0, 0,mode,0,NULL);
 
 			// update slot index
 			t_slot_idx = next_slot; // this slot is ready to send