rebase branch to develop 2017.w09

openair1/PHY/LTE_TRANSPORT/dci_tools.c

@@ -5710,9 +5710,9 @@ void prepare_dl_decoding_format2_2A(DCI_format_t dci_format,
       if (TB0_active==0) {
         dlsch0_harq->status = SCH_IDLE;
         pdlsch0->active     = 0;
-#ifdef DEBUG_HARQ
+  #ifdef DEBUG_HARQ
         printf("[DCI UE]: TB0 is deactivated, retransmit TB1 transmit in TM6\n");
-#endif
+  #endif
       }
 
       if (TB1_active==0) {

openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c

@@ -1661,8 +1661,7 @@ void prec2A_TM3_128(__m128i *ch0,__m128i *ch1) {
 
   __m128i tmp0,tmp1;
 
-
-//_mm_mulhi_epi16
+  //_mm_mulhi_epi16
   //  print_shorts("prec2A_TM3 ch0 (before):",ch0);
   //  print_shorts("prec2A_TM3 ch1 (before):",ch1);
 

openair3/NAS/TOOLS/network.h

@@ -61,7 +61,7 @@ Description Defines a list of PLMN network operators
 #define VDF5  11
 
 
-#define SELECTED_PLMN TEST1 //SFR1
+#define SELECTED_PLMN OAI_LTEBOX //SFR1
 
 #define TEST_PLMN {0,0,0x0f,1,1,0}  // 00101
 #define SFR_PLMN_1  {0,2,0x0f,8,0,1}  // 20810

openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf

@@ -86,14 +86,14 @@ UE0:
     };
 
     SIM: {
-        MSIN="000001234";
-        USIM_API_K="000102030405060708090A0B0C0D0E0F";
+        MSIN="0100001111";
+        USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f";
         OPC="C42449363BBAD02B66D16BC975D77CC1";
-        MSISDN="000000000000";//"33611123456";
+        MSISDN="33611123456";
     };
 
     # Home PLMN Selector with Access Technology
-    HPLMN= "00101";
+    HPLMN= "20893";
 
     # User controlled PLMN Selector with Access Technology
     UCPLMN_LIST = ();

openair3/NAS/UE/ESM/esm_ebr_context.c

@@ -286,7 +286,7 @@ int esm_ebr_context_create(
              LOG_TRACE(INFO, "ESM-PROC  - executing %s ",
                        command_line);
 
-             //if (system(command_line)) ; /* TODO: what to do? */
+             if (system(command_line)) ; /* TODO: what to do? */
 
              break;
 

targets/RT/USER/lte-ue.c

@@ -574,7 +574,6 @@ static void *UE_thread_rxn_txnp4(void *arg) {
         }
 
         stop_meas(&UE->generic_stat);
-            //printf("mac_xface->ue_scheduler %5.2f \n",UE->generic_stat.p_time/(cpuf*1000.0));
 
         // Prepare the future Tx data