deleting some old unused files

oaisim now also compiles with OPENAIR2=0
PDCCH now generates dummy data instead of zeors (needed for power measurements)
fixed bug in DAC (power levels)


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

targets/SIMU/USER/Makefile

@@ -4,7 +4,7 @@ include Makerules
 CPUFLAGS = -mmmx -msse -msse2 -msse4.1 -march=native
 # FORCE ssse3 for compilation of openair on User Mode Linux
 CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ; else if grep --silent User\ Mode\ Linux /proc/cpuinfo ; then echo "-mssse3" ; else echo ""; fi; fi)
-CPUFLAGS += $(shell if grep --silent sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi)
+CPUFLAGS += $(shell if grep --silent -w sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi)
 linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
 
 COMMON_UTILS_DIR    = $(OPENAIR_HOME)/common/utils
@@ -20,7 +20,7 @@ SCTP_DIR            = $(OPENAIR_HOME)/openair-cn/SCTP
 export S1AP_DIR
 export COMMON_UTILS_DIR
 
-CFLAGS = -Wall -fno-strict-aliasing -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat
+CFLAGS = -O2 -Wall -fno-strict-aliasing -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 -g -ggdb $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat
 
 ifdef ENABLE_ITTI
 CFLAGS += -DENABLE_ITTI
@@ -418,6 +418,9 @@ rrm_std_cellular:
 cleanall: clean cleanasn1
 	@if [ -d $(S1AP_DIR) ];then $(MAKE) -C $(S1AP_DIR) -f Makefile.eNB cleanall; fi
 
+cleanalmostall: clean 
+	rm -f $(ASN1_MSG_OBJS1)
+
 clean:
 	@$(MAKE) -C $(LFDS_DIR) -f makefile.linux clean
 	@$(RM_F_V) oaisim
@@ -458,6 +461,9 @@ cleancell:
 	@$(RM_F_V) $(OPENAIR2_DIR)/NAS/SIMU_CELLULAR/*.o
 	@$(RM_F_V) $(OPENAIR2_DIR)/NAS/SIMU_CELLULAR/*.d
 
+cleanlfds:
+	$(MAKE) -C $(LFDS_DIR) -f makefile.linux clean
+
 print:
 #	@echo $(cygwin)
 	@echo "OBJ " 			$(OBJ)

targets/SIMU/USER/oaisim.c

@@ -546,11 +546,13 @@ void *l2l1_task(void *args_p) {
               EMU,
               "PHY procedures eNB %d for frame %d, slot %d (subframe TX %d, RX %d) TDD %d/%d Nid_cell %d\n", eNB_id, frame, slot, next_slot >> 1, last_slot>>1, PHY_vars_eNB_g[eNB_id]->lte_frame_parms.frame_type, PHY_vars_eNB_g[eNB_id]->lte_frame_parms.tdd_config, PHY_vars_eNB_g[eNB_id]->lte_frame_parms.Nid_cell);
 
+#ifdef OPENAIR2
           //Appliation: traffic gen
           update_otg_eNB (eNB_id, oai_emulation.info.time_ms);
 
           //IP/OTG to PDCP and PDCP to IP operation
           pdcp_run (frame, 1, 0, eNB_id); //PHY_vars_eNB_g[eNB_id]->Mod_id
+#endif
 
           // PHY_vars_eNB_g[eNB_id]->frame = frame;
           phy_procedures_eNB_lte (last_slot, next_slot, PHY_vars_eNB_g[eNB_id], abstraction_flag, no_relay, NULL);
@@ -594,11 +596,13 @@ void *l2l1_task(void *args_p) {
               if (frame > 0) {
                 PHY_vars_UE_g[UE_id]->frame = frame;
 
+#ifdef OPENAIR2
                 //Application
                 update_otg_UE (UE_id, oai_emulation.info.time_ms);
 
                 //Access layer
                 pdcp_run (frame, 0, UE_id, 0);
+#endif
 
                 phy_procedures_UE_lte (last_slot, next_slot, PHY_vars_UE_g[UE_id], 0, abstraction_flag, normal_txrx,
                                        no_relay, NULL);

targets/SIMU/USER/oaisim_functions.c

@@ -446,7 +446,7 @@ void check_and_adjust_params() {
   NB_eNB_INST = oai_emulation.info.nb_enb_local + oai_emulation.info.nb_enb_remote;
   NB_RN_INST = oai_emulation.info.nb_rn_local + oai_emulation.info.nb_rn_remote;
 
-#if defined(ENABLE_PDCP_NETLINK_FIFO)
+#if defined(ENABLE_PDCP_NETLINK_FIFO) && defined(OPENAIR2)
   pdcp_netlink_init();
 #endif
 
@@ -471,6 +471,7 @@ void check_and_adjust_params() {
 
 }
 
+#ifdef OPENAIR2
 void init_omv() {
   if (oai_emulation.info.omv_enabled == 1) {
 
@@ -506,6 +507,7 @@ if(close( pfd[0] ) == -1 ) // we close the write desc.
       perror("close on read\n" );
   }
 }
+#endif
 
 void init_seed(u8 set_seed) {
 
@@ -804,8 +806,9 @@ void update_ocm() {
   }
 }
 
+#ifdef OPENAIR2
 void update_otg_eNB(int module_id, unsigned int ctime) {
-#if defined(USER_MODE) && defined(OAI_EMU)
+#if defined(USER_MODE) && defined(OAI_EMU) 
   if (oai_emulation.info.otg_enabled ==1 ) {
 
     int dst_id, app_id;
@@ -980,6 +983,7 @@ void update_otg_UE(int UE_id, unsigned int ctime) {
   }
 #endif
 }
+#endif
 
 int init_slot_isr(void)
 {