Merge branch 'merge_oaidevelop' into develop

openair2/LAYER2/MAC/eNB_scheduler_bch.c

@@ -697,6 +697,7 @@ schedule_SI(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
 		    LOG_D(MAC, "Frame %d: Subframe %d : Adding common DCI for S_RNTI\n", frameP, subframeP);
 		    dl_req->number_dci++;
 		    dl_req->number_pdu++;
+                    dl_req->tl.tag = NFAPI_DL_CONFIG_REQUEST_BODY_TAG;
 		    dl_config_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
 		    memset((void *) dl_config_pdu, 0,
 			   sizeof(nfapi_dl_config_request_pdu_t));

targets/RT/USER/lte-enb.c

@@ -947,7 +947,7 @@ void init_eNB_proc(int inst) {
     }
     else if (nfapi_mode == 2) { // this is neccesary in VNF or L2 FAPI simulator.
       pthread_create( &L1_proc->pthread, attr0, L1_thread, L1_proc);
-      pthread_create( &L1_proc_tx->pthread, attr1, L1_thread_tx, proc);
+      pthread_create( &L1_proc_tx->pthread, attr1, L1_thread, L1_proc_tx);
     }
     pthread_create( &proc->pthread_prach, attr_prach, eNB_thread_prach, eNB );
 #if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))

targets/RT/USER/lte-uesoftmodem.c

@@ -984,12 +984,12 @@ int main( int argc, char **argv ) {
       init_UE_stub_single_thread(NB_UE_INST,eMBMS_active,uecap_xer_in,emul_iface);
   }
   else {
-      init_UE(NB_UE_INST,eMBMS_active,uecap_xer_in,0,phy_test,UE_scan,UE_scan_carrier,mode,(int)rx_gain[0][0],tx_max_power[0],
+      init_UE(NB_UE_INST,eMBMS_active,uecap_xer_in,0,get_softmodem_params()->phy_test,UE_scan,UE_scan_carrier,mode,(int)rx_gain[0][0],tx_max_power[0],
               frame_parms[0]);
   }
 
 
-  if (phy_test==0) {
+  if (get_softmodem_params()->phy_test==0) {
     printf("Filling UE band info\n");
     fill_ue_band_info();
     dl_phy_sync_success (0, 0, 0, 1);
@@ -999,7 +999,7 @@ int main( int argc, char **argv ) {
       number_of_cards = 1;
       for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
               PHY_vars_UE_g[0][CC_id]->rf_map.card=0;
-              PHY_vars_UE_g[0][CC_id]->rf_map.chain=CC_id+chain_offset;
+              PHY_vars_UE_g[0][CC_id]->rf_map.chain=CC_id+get_softmodem_params()->chain_offset;
       }
   }
   // connect the TX/RX buffers