remove some cleanup, in case it made regression

cmake_targets/CMakeLists.txt

@@ -479,7 +479,7 @@ add_dependencies(X2AP_ENB rrc_flag x2_flag)
 add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4")
 add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")
 
-add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR")
+add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR" "OAI_SIMU")
 if (NOT ${RF_BOARD} STREQUAL "None")
    add_definitions(-DMANAGED_RF=1)
 endif()
@@ -1675,6 +1675,9 @@ if(NAS_UE)
     ${libnas_ue_esm_sap_OBJS}
   )
   add_dependencies(LIB_NAS_UE rrc_flag)
+  if (NOT ${NOS1})
+  target_compile_definitions(LIB_NAS_UE PUBLIC -DPDCP_USE_NETLINK)
+  endif()
   set(NAS_UE_LIB LIB_NAS_UE)
 
   include_directories(${NAS_SRC}UE)

openair1/PHY/LTE_TRANSPORT/dci.c

@@ -60,7 +60,7 @@
 //static uint8_t d[3*(MAX_DCI_SIZE_BITS + 16) + 96];
 //static uint8_t w[3*3*(MAX_DCI_SIZE_BITS+16)];
 
-static uint  dci_encoding(uint8_t *a,
+void dci_encoding(uint8_t *a,
                   uint8_t A,
                   uint16_t E,
                   uint8_t *e,
@@ -101,7 +101,7 @@ static uint  dci_encoding(uint8_t *a,
 #ifdef DEBUG_DCI_ENCODING
   printf("Doing DCI rate matching for %d channel bits, RCC %d, e %p\n",E,RCC,e);
 #endif
-  return lte_rate_matching_cc(RCC,E,w,e);
+  lte_rate_matching_cc(RCC,E,w,e);
 
 
 
@@ -109,8 +109,8 @@ static uint  dci_encoding(uint8_t *a,
 }
 
 
-static uint generate_dci0(uint8_t *dci,
-                       uint8_t *eee,
+uint8_t *generate_dci0(uint8_t *dci,
+                       uint8_t *e,
                        uint8_t DCI_LENGTH,
 		       uint16_t coded_bits,
                        uint16_t rnti)
@@ -149,7 +149,9 @@ static uint generate_dci0(uint8_t *dci,
 #endif
   }
 
-  return dci_encoding(dci_flip,DCI_LENGTH,coded_bits,eee,rnti);
+  dci_encoding(dci_flip,DCI_LENGTH,coded_bits,e,rnti);
+
+  return(e+coded_bits);
 }
 
 //uint32_t Y;
@@ -266,12 +268,13 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
 {
 
 
+  uint8_t *e_ptr;
   int8_t L;
   uint32_t i, lprime;
   uint32_t gain_lin_QPSK,kprime,kprime_mod12,mprime,nsymb,symbol_offset,tti_offset;
   int16_t re_offset;
   uint8_t mi = get_mi(frame_parms,subframe);
-  uint8_t eee[DCI_BITS_MAX];
+  uint8_t e[DCI_BITS_MAX];
   uint32_t Msymb=(DCI_BITS_MAX/2);
   int32_t yseq0[Msymb],yseq1[Msymb],wbar0[Msymb],wbar1[Msymb];
 
@@ -331,14 +334,14 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
    * but it has to be validated for all the various cases
    * so let's just do it for the basic simulator
    */
-  memset(eee, 2, DCI_BITS_MAX);
+  memset(e, 2, DCI_BITS_MAX);
 #else
 #if 1
   // reset all bits to <NIL>, here we set <NIL> elements as 2
   // memset(e, 2, DCI_BITS_MAX);
   // here we interpret NIL as a random QPSK sequence. That makes power estimation easier.
   for (i=0; i<DCI_BITS_MAX; i++)
-    eee[i]=taus()&1;
+    e[i]=taus()&1;
 #endif
 
   /* clear all bits, the above code may generate too much false detections
@@ -347,7 +350,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
   //memset(e, 0, DCI_BITS_MAX);
 #endif /* BASIC_SIMULATOR */
 
-  uint8_t * e_ptr = eee;
+  e_ptr = e;
 
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_GENERATE_DCI0,1);
 
@@ -364,8 +367,8 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
 		dci_alloc[i].rnti);
 
         if (dci_alloc[i].firstCCE>=0) {
-          e_ptr += generate_dci0(dci_alloc[i].dci_pdu,
-                                e_ptr,
+          e_ptr = generate_dci0(dci_alloc[i].dci_pdu,
+                                e+(72*dci_alloc[i].firstCCE),
                                 dci_alloc[i].dci_length,
                                 72*dci_alloc[i].L,
                                 dci_alloc[i].rnti);
@@ -387,14 +390,14 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
   // random value creates wrong DCI detection
   // scrambler will do some randomization 
   if ( getenv("RFSIMULATOR") != NULL) {
-      uint8_t*end=eee+8*get_nquad(num_pdcch_symbols, frame_parms, mi);
+      uint8_t*end=e+8*get_nquad(num_pdcch_symbols, frame_parms, mi);
       uint8_t dummy=0;
       for (uint8_t* p=e_ptr; p < end ; p++)
         *p=dummy++&1;
   }
   pdcch_scrambling(frame_parms,
                    subframe,
-                   eee,
+                   e,
                    8*get_nquad(num_pdcch_symbols, frame_parms, mi));
   VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCCH_SCRAMBLING,0);
   //72*get_nCCE(num_pdcch_symbols,frame_parms,mi));
@@ -409,7 +412,7 @@ uint8_t generate_dci_top(uint8_t num_pdcch_symbols,
   else
     gain_lin_QPSK = amp/2;
 
-  e_ptr = eee;
+  e_ptr = e;
 
 #ifdef DEBUG_DCI_ENCODING
   printf(" PDCCH Modulation, Msymb %d, Msymb2 %d,gain_lin_QPSK %d\n",Msymb,Msymb2,gain_lin_QPSK);

targets/COMMON/openairinterface5g_limits.h

 #ifndef OPENAIRINTERFACE5G_LIMITS_H_
 #define OPENAIRINTERFACE5G_LIMITS_H_
 
-#if defined(CBMIMO1) || defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_LMSSDR)
+#if defined(MANAGED_RF)
 #        define NUMBER_OF_eNB_MAX 1
 #        define NUMBER_OF_RU_MAX 2
 #        ifndef UE_EXPANSION

targets/RT/USER/lte-ue.c

@@ -636,7 +636,7 @@ static void *UE_thread_synch(void *arg)
 	UE->rfdevice.trx_set_freq_func(&UE->rfdevice,&openair0_cfg[0],0);
 	//UE->rfdevice.trx_set_gains_func(&openair0,&openair0_cfg[0]);
 	//UE->rfdevice.trx_stop_func(&UE->rfdevice);
-	usleep(10000);
+	sleep(1);
 	init_frame_parms(&UE->frame_parms,1);
 	/*if (UE->rfdevice.trx_start_func(&UE->rfdevice) != 0 ) {
 	  LOG_E(HW,"Could not start the device\n");