Merged with trunk

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

openair-cn/NAS/EURECOM-NAS/Makefile

@@ -37,7 +37,7 @@ export PROJDIR	= $(CURDIR)
 
 all:
 ifeq ($(PROCESS), UE)
-	@$(CD) $(SECUDIR)  && $(MAKE)
+	@$(CD) $(SECUDIR)  && $(MAKE) -f Makefile.NAS
 endif
 	@$(CD) $(UTILDIR) && $(MAKE)
 	@$(CD) $(APIDIR)  && $(MAKE)

openair-cn/NAS/EURECOM-NAS/tools/Makefile

@@ -34,13 +34,14 @@ endif
 
 include $(PROJDIR)/Makerules
 include $(PROJDIR)/Makefile.inc
+include $(PROJDIR)/../Makefile.tools
 
 export LD_RUN_PATH = $(LIBDIR):$(LIBPROCESS)
 
-LIBS		= -lapi -lutil -lEMMmsg -lESMmsg -lies -lrt 
+LIBS		= -luenas.a -lrt 
 INCLUDES	= -I. -I$(INCDIR) -I$(UTILDIR) -I$(USIMAPIDIR) -I$(EMMDIR) -I$(ESMDIR) -I$(IESDIR)
 
-LIBSUTIL	= $(LIBDIR)/$(LIBUTIL).a $(LIBDIR)/$(LIBUTIL).so
+#LIBSUTIL	= $(LIBDIR)/$(LIBUTIL).a $(LIBDIR)/$(LIBUTIL).so
 
 USIM_OBJ	= usim_data.o
 UE_OBJ		= ue_data.o
@@ -57,13 +58,13 @@ all: $(TARGETS)
 	$(CC) $(CFLAGS)   -c $< -o $@
 
 $(USIM_TARGET): $(USIM_OBJ) $(LIBSUTIL)
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SECUDIR)/*.o -lnettle -lcrypto -lm
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)  -lnettle -lcrypto -lm
 	@echo Replacing $@ to $(BINDIR)
 	@$(RM) $(BINDIR)/$@
 	@$(CP) $@ $(BINDIR)
 
 $(UE_TARGET): $(UE_OBJ) $(LIBSUTIL)
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SECUDIR)/*.o -lnettle -lcrypto -lm
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)  -lnettle -lcrypto -lm
 	@echo Replacing $@ to $(BINDIR)
 	@$(RM) $(BINDIR)/$@
 	@$(CP) $@ $(BINDIR)
@@ -74,6 +75,10 @@ clean:
 veryclean: clean
 	$(RM) $(TARGETS)
 
+veryveryclean: veryclean
+	$(RM) -Rf *.o $(PROJDIR)
+	$(RM) -Rf *.a $(PROJDIR)
+
 depend:
 	makedepend -- ${CFLAGS} -- ${SRCS}
 

openair-cn/NAS/EURECOM-NAS/tools/ue_data.c

@@ -53,8 +53,7 @@ Description	Implements the utility used to generate data stored in the
 #include <stdlib.h>	// exit, free
 #include <string.h>	// memset, strncpy
 
-//#define SELECTED_PLMN SFR1
-#define SELECTED_PLMN FCT1
+#define SELECTED_PLMN SFR1
 
 /****************************************************************************/
 /****************  E X T E R N A L    D E F I N I T I O N S  ****************/
@@ -290,7 +289,7 @@ static void _gen_user_data(user_nvdata_t* data)
 static void _gen_emm_data(emm_nvdata_t* data)
 {
 //#if (SELECTED_PLMN == FCT1)
-#if 1
+#if 0
     /*
      * International Mobile Subscriber Identity
      * IMSI = MCC + MNC + MSIN = 310 (USA) + 028 (UNKNOWN) + 90832150

openair-cn/OPENAIRHSS/auc/auc.h

@@ -28,6 +28,7 @@
  *******************************************************************************/
 #include <stdint.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <gmp.h>
 
 #ifndef AUC_H_

openair1/PHY/LTE_TRANSPORT/defs.h

@@ -70,11 +70,21 @@
 #define MAX_NUM_CHANNEL_BITS (14*1200*6)  // 14 symbols, 1200 REs, 12 bits/RE
 #define MAX_NUM_RE (14*1200)
 
+#if !defined(SI_RNTI)
 #define SI_RNTI  (rnti_t)0xffff
+#endif
+#if !defined(M_RNTI)
 #define M_RNTI   (rnti_t)0xfffd
+#endif
+#if !defined(P_RNTI)
 #define P_RNTI   (rnti_t)0xfffe
+#endif
+#if !defined(CBA_RNTI)
 #define CBA_RNTI (rnti_t)0xfff4
+#endif
+#if !defined(C_RNTI)
 #define C_RNTI   (rnti_t)0x1234
+#endif
 
 #define PMI_2A_11 0
 #define PMI_2A_1m1 1

targets/RT/USER/lte-softmodem.c

@@ -159,7 +159,6 @@ int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg,
 int setup_eNB_buffers(PHY_VARS_eNB **phy_vars_eNB, openair0_config_t *openair0_cfg, openair0_rf_map rf_map[MAX_NUM_CCs]);
 
 void fill_ue_band_info(void);
-
 #ifdef XFORMS
 // 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 
@@ -250,6 +249,7 @@ static uint32_t                 downlink_frequency[MAX_NUM_CCs][4];/* =     {{19
 								      {1907600000,1907600000,1907600000,1907600000}};*/
 static int32_t                  uplink_frequency_offset[MAX_NUM_CCs][4]; /*= {{0,0,0,0},{0,0,0,0}};
 									  */
+
 openair0_rf_map rf_map[MAX_NUM_CCs];
 
 static char                    *conf_config_file_name = NULL;
@@ -464,7 +464,6 @@ static const eutra_band_t eutra_bands[] =
     {43, 3600    * MHz, 3800    * MHz, 3600    * MHz, 3800    * MHz, TDD},
     {44, 703    * MHz, 803    * MHz, 703    * MHz, 803    * MHz, TDD},
   };
-
 unsigned int build_rflocal(int txi, int txq, int rxi, int rxq)
 {
   return (txi + (txq<<6) + (rxi<<12) + (rxq<<18));
@@ -1023,13 +1022,13 @@ static void * eNB_thread_tx(void *param) {
   if (task==NULL) {
   LOG_E(PHY,"[SCHED][eNB] Problem starting eNB_proc_TX thread_index %d (%s)!!!!\n",proc->subframe,task_name);
   return 0;
-  }
+}
   else {
   LOG_I(PHY,"[SCHED][eNB] eNB TX thread CC %d SF %d started with id %p\n",
     proc->CC_id,
     proc->subframe,
     task);
-  }
+}
 #else
 #ifdef LOWLATENCY
   attr.size = sizeof(attr);
@@ -1046,7 +1045,7 @@ static void * eNB_thread_tx(void *param) {
   if (sched_setattr(0, &attr, flags) < 0 ){
   perror("[SCHED] eNB tx thread: sched_setattr failed\n");
   exit(-1);
-  }
+}
   LOG_I(HW,"[SCHED] eNB TX deadline thread %d(id %ld) started on CPU %d\n",
     proc->subframe, gettid(),sched_getcpu());
 #else 
@@ -1103,30 +1102,30 @@ static void * eNB_thread_tx(void *param) {
 
   phy_procedures_eNB_TX(proc->subframe,PHY_vars_eNB_g[0][proc->CC_id],0,no_relay,NULL);
       
-    }
+}
   if ((subframe_select(&PHY_vars_eNB_g[0][proc->CC_id]->lte_frame_parms,proc->subframe_tx)==SF_S)) {
   phy_procedures_eNB_TX(proc->subframe,PHY_vars_eNB_g[0][proc->CC_id],0,no_relay,NULL);
-    }
+}
     
   do_OFDM_mod_rt(proc->subframe_tx,PHY_vars_eNB_g[0][proc->CC_id]);  
     
   if (pthread_mutex_lock(&proc->mutex_tx) != 0) {
   printf("[openair][SCHED][eNB] error locking mutex for eNB TX proc %d\n",proc->subframe);
-    }
+}
   else {
   proc->instance_cnt_tx--;
       
   if (pthread_mutex_unlock(&proc->mutex_tx) != 0) {	
   printf("[openair][SCHED][eNB] error unlocking mutex for eNB TX proc %d\n",proc->subframe);
-      }
-    }
+}
+}
 
     
   proc->frame_tx++;
   if (proc->frame_tx==1024)
     proc->frame_tx=0;
 
-  }    
+}    
   stop_meas(&softmodem_stats_tx_sf[proc->subframe]);
   vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_TX0+(2*proc->subframe),0);        
 #ifdef HARD_RT
@@ -1149,8 +1148,8 @@ static void * eNB_thread_tx(void *param) {
 #endif
 }
 
-int eNB_thread_rx_status[10];
-static void * eNB_thread_rx(void *param) {
+  int eNB_thread_rx_status[10];
+  static void * eNB_thread_rx(void *param) {
 
   //unsigned long cpuid;
   eNB_proc_t *proc = (eNB_proc_t*)param;
@@ -1177,7 +1176,7 @@ static void * eNB_thread_rx(void *param) {
   if (task==NULL) {
   LOG_E(PHY,"[SCHED][eNB] Problem starting eNB_proc_RX thread_index %d (%s)!!!!\n",proc->subframe,task_name);
   return 0;
-  }
+}
   else {
     LOG_I(PHY,"[SCHED][eNB] eNB RX thread CC_id %d SF %d started with id %p\n", /*  on CPU %d*/
 	  proc->CC_id,
@@ -1476,6 +1475,7 @@ static void *eNB_thread(void *arg)
   attr.sched_deadline = 0.5 * 1000000;
   attr.sched_period   = 1.0   * 1000000;
 
+   
   /* pin the eNB main thread to CPU0*/
   /* if (pthread_setaffinity_np(pthread_self(), sizeof(mask),&mask) <0) {
      perror("[MAIN_ENB_THREAD] pthread_setaffinity_np failed\n");
@@ -1875,7 +1875,6 @@ static void *UE_thread_synch(void *arg) {
     LOG_D(PHY,"[SCHED][UE] Check absolute frequency %u\n",downlink_frequency[0][0]);
     sync_mode=pbch;
   }
-
   while (!oai_exit) {
     
     if (pthread_mutex_lock(&UE->mutex_synch) != 0) {
@@ -1892,7 +1891,6 @@ static void *UE_thread_synch(void *arg) {
       }
     
     }  // mutex_lock      
-
     vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SYNCH,1); 
 
     switch (sync_mode) {
@@ -1995,11 +1993,12 @@ static void *UE_thread_synch(void *arg) {
 	//	    rt_sleep_ns(FRAME_PERIOD);
       } // freq_offset
     } // initial_sync=0
+    
   break;
  case si:
  default:
-      break;
-    }
+break;
+}
     vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SYNCH,0);  
     printf("Finished synch : Locking synch mutex (thread_sync)\n");
     if (pthread_mutex_lock(&UE->mutex_synch) != 0) {
@@ -2012,6 +2011,7 @@ static void *UE_thread_synch(void *arg) {
 	printf("[openair][SCHED][eNB] error unlocking mutex for UE synch\n");
       }
     }
+    
     vcd_signal_dumper_dump_function_by_name(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SYNCH,0); 
   }  // while !oai_exit
   return(0);
@@ -2302,11 +2302,11 @@ static void *UE_thread(void *arg) {
   void *rxp[2],*txp[2];
 
   /*
-    #ifdef LOWLATENCY
+#ifdef LOWLATENCY
   struct sched_attr attr;
   unsigned int flags = 0;
     unsigned long mask = 1; // processor 0 
-    #endif
+#endif
   */
 
   printf("waiting for sync (UE_thread)\n");
@@ -2323,7 +2323,7 @@ static void *UE_thread(void *arg) {
 
   printf("starting UE thread\n");
   /*
-    #ifdef LOWLATENCY
+#ifdef LOWLATENCY
   attr.size = sizeof(attr);
   attr.sched_flags = 0;
   attr.sched_nice = 0;
@@ -2347,7 +2347,7 @@ static void *UE_thread(void *arg) {
     LOG_I(HW,"[SCHED][eNB] eNB main deadline thread %ld started on CPU %d\n",
 	  gettid(),sched_getcpu());
   }
-    #endif
+#endif
   */
   mlockall(MCL_CURRENT | MCL_FUTURE);
 
@@ -2497,7 +2497,6 @@ static void *UE_thread(void *arg) {
 	    //LOG_D(PHY,"HW RESYNC: hw_frame %d: Resynchronizing sample stream\n");
 	    frame=0;
 	    // dump ahead in time to start of frame
-
 #ifndef USRP_DEBUG
 	    rxs = openair0.trx_read_func(&openair0,
 					 &timestamp,
@@ -2941,7 +2940,6 @@ void init_UE_threads(void) {
 }
 
 
-
 void fill_ue_band_info() {
 
   UE_EUTRA_Capability_t *UE_EUTRA_Capability = UE_rrc_inst[0].UECap->UE_EUTRA_Capability;
@@ -2969,7 +2967,6 @@ void fill_ue_band_info() {
       }
   }
 }
-
 static void get_options (int argc, char **argv) {
   int c;
   //  char                          line[1000];
@@ -2988,7 +2985,6 @@ static void get_options (int argc, char **argv) {
 
 
 
-
   const Enb_properties_array_t *enb_properties;
   
   enum long_option_e {
@@ -3309,7 +3305,7 @@ int main(int argc, char **argv) {
   //  int *eNB_thread_status_rx[10],*eNB_thread_status_tx[10];
 #endif
   int i,aa,card;
-#if defined (XFORMS) || defined (EMOS) || defined(EXMIMO)
+#if defined (XFORMS) || defined (EMOS) || defined (EXMIMO)
   void *status;
 #endif
   
@@ -3334,7 +3330,6 @@ int main(int argc, char **argv) {
   memset(&openair0_cfg[0],0,sizeof(openair0_config_t)*MAX_CARDS);
 
   memset(tx_max_power,0,sizeof(int)*MAX_NUM_CCs);
-
   set_latency_target();
 
   mode = normal_txrx;
@@ -3799,7 +3794,6 @@ int main(int argc, char **argv) {
   }
   printf("ITTI tasks created\n");
 #endif
-
   printf("Filling UE band info\n");
   if (UE_flag==1)
     fill_ue_band_info();

targets/build_helper.bash

@@ -846,6 +846,29 @@ compile_unisim() {
         return 1
     fi
 }
+
+compile_nas_tools() {
+
+    export NVRAM_DIR=$OPENAIR_TARGETS/bin
+    
+    cd $NVRAM_DIR
+    
+        if [ ! -f /tmp/nas_cleaned ]; then
+            echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools veryveryclean"
+            make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools veryveryclean
+        fi
+        echo_success "make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools all"
+        make --directory=$OPENAIRCN_DIR/NAS/EURECOM-NAS/tools all
+        rm .ue.nvram
+        rm .usim.nvram
+        touch /tmp/nas_cleaned
+}
+
+
+compile_ue_ip_nw_driver() {
+    cd $OPENAIR2_DIR && make ue_ip.ko
+}
+
 ################################################
 # 1. check if the executable functions exist
 ###############################################
@@ -935,10 +958,20 @@ check_for_mbmssim_executable() {
     fi
 }
 
+check_for_nas_ue_executable() {
+    if [ ! -f $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/UserProcess ]; then
+        echo_error "Cannot find UserProcess executable object in directory  $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin"
+        echo_fatal "Check the compilation logs in bin/install_log.txt"
+    fi
+}
+
 ################################################
 # 1. check if the executable functions exist
 ###############################################
 
+# arg1 is RT
+# arg2 is HW 
+# arg3 is ENB_S1
 install_ltesoftmodem() {
     # RT
     if [ $1 = "RTAI" ]; then 
@@ -986,12 +1019,32 @@ install_ltesoftmodem() {
     
 }
 
+# arg1 is ENB_S1 'boolean'
 install_oaisim() {
    if [ $1 = 0 ]; then 
        cd $OPENAIR2_DIR && make clean && make nasmesh_netlink.ko  #|| exit 1
        cd $OPENAIR2_DIR/NAS/DRIVER/MESH/RB_TOOL && make clean && make  # || exit 1
+   else
+       compile_ue_ip_nw_driver
+       install_nas_tools
+   fi 
+   
+}
+
+
+install_nas_tools() {
+    cd $OPENAIR_TARGETS/bin
+    if [ ! -f .ue.nvram ]; then
+        echo_success "generate .ue_emm.nvram .ue.nvram"
+        $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
     fi
 
+    if [ ! -f .usim.nvram ]; then
+        echo_success "generate .usim.nvram"
+        $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
+    fi
+    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print
+    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print
 }
 
 ##################################

targets/build_oai.bash

@@ -473,6 +473,12 @@ build_enb(){
             check_for_oaisim_executable
             echo_info "7.2 finished oaisim target: check the installation log file bin/install_log.txt" 
             
+            if [ $ENB_S1 -eq 1 ]; then
+                compile_nas_tools  2>&1
+                nas_tools_compiled=$?  
+                check_for_nas_tools_executable
+                echo_info "7.2.1 finished nas ue target: check the installation log file bin/install_log.txt"
+            fi
         fi
         if [ $TARGET = "UNISIM" ]; then 
            echo "################## compile_unisim ##################"  >> bin/install_log.txt 
@@ -800,6 +806,39 @@ if [ $RUN -ne 0 ]; then
                     $SUDO echo "run" >> ~/.gdb_lte_softmodem
                     $SUDO gdb -nh -x ~/.gdb_lte_softmodem 2>&1 
                 fi
+                
+            elif [ $TARGET == "OAISIM" ]; then
+            
+                if [ $ENB_S1 -eq 0 ]; then
+                    echo_error "TODO: LOAD NASMESH IP DRIVER FOR UE AND eNB" 
+                else
+                    # prepare NAS for UE
+                    if [ ! -f .ue.nvram ]; then
+                        echo_success "generate .ue_emm.nvram .ue.nvram"
+                        $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
+                    fi
+
+                    if [ ! -f .usim.nvram ]; then
+                        echo_success "generate .usim.nvram"
+                        $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
+                    fi
+                    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/ue_data --print
+                    $OPENAIRCN_DIR/NAS/EURECOM-NAS/bin/usim_data --print
+
+                    insmod  $OPENAIR2_DIR/NETWORK_DRIVER/UE_IP/ue_ip.ko
+                    
+                fi
+                
+                if [ $RUN_GDB -eq 0 ]; then 
+                    $SUDO exec $OPENAIR_TARGETS/bin/oaisim  `echo $EXE_ARGUMENTS`
+                else
+                    $SUDO setenv MALLOC_CHECK_ 2
+                    $SUDO touch ~/.gdb_oaisim
+                    $SUDO echo "file $OPENAIR_TARGETS/bin/lte-oaisim" > ~/.gdb_oaisim
+                    $SUDO echo "set args $EXE_ARGUMENTS" >> ~/.gdb_oaisim
+                    $SUDO echo "run" >> ~/.gdb_oaisim
+                    $SUDO gdb -nh -x ~/.gdb_oaisim 2>&1 
+                fi
             fi
             ;;