fixing emulate_rf for nr-softmodem

executables/nr-ru.c

@@ -1441,10 +1441,12 @@ void *ru_thread( void *param ) {
 
   LOG_I(PHY,"Starting RU %d (%s,%s),\n",ru->idx,NB_functions[ru->function],NB_timing[ru->if_timing]);
 
+  memcpy((void*)&ru->config,(void*)&RC.gNB[0]->gNB_config,sizeof(ru->config));
+
   if(emulate_rf) {
-    fill_rf_config(ru,ru->rf_config_file);
     nr_init_frame_parms(&ru->config, fp);
     nr_dump_frame_parms(fp);
+    fill_rf_config(ru,ru->rf_config_file);
     nr_phy_init_RU(ru);
 
     if (setup_RU_buffers(ru)!=0) {
@@ -1463,8 +1465,6 @@ void *ru_thread( void *param ) {
       AssertFatal(ret==0,"Cannot connect to remote radio\n");
     }
 
-    memcpy((void*)&ru->config,(void*)&RC.gNB[0]->gNB_config,sizeof(ru->config));
-
     if (ru->if_south == LOCAL_RF) { // configure RF parameters only
       nr_init_frame_parms(&ru->config, fp);
       nr_dump_frame_parms(fp);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -401,8 +401,8 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   // hardcoding dlsch to be in slot 1
   if (!(slot_txP%num_slots_per_tdd)) {
     if(slot_txP==0)
-      *dlsch_in_slot_bitmap = 0x7e;
-    else
+      *dlsch_in_slot_bitmap = 0x00;
+    else //this is never reached!?!
       *dlsch_in_slot_bitmap = 0x00;
   }
 
@@ -466,6 +466,29 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
     else
       UE_list->fiveG_connected[UE_id] = true;
 
+    if (get_softmodem_params()->phy_test == 1) {
+      if (slot_txP == 6){
+	NR_RA_t *ra = &RC.nrmac[module_idP]->common_channels[0].ra[0];
+	ra->Msg2_frame = frame_txP;
+	ra->Msg2_slot = slot_txP;
+	ra->state = Msg2;
+	ra->bwp_id = 1;
+	NR_CellGroupConfig_t *secondaryCellGroup = UE_list->secondaryCellGroup[UE_id];
+	NR_BWP_Downlink_t *bwp=secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[ra->bwp_id-1];
+	struct NR_PDCCH_ConfigCommon__commonSearchSpaceList *commonSearchSpaceList = bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList;
+	for (int i=0;i<commonSearchSpaceList->list.count;i++) {
+	  NR_SearchSpace_t *ss=commonSearchSpaceList->list.array[i];
+	  if(ss->searchSpaceId == *bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->ra_SearchSpace)
+	    ra->ra_ss=ss;
+	}
+	AssertFatal(ra->ra_ss!=NULL,"no search space for RA'n");
+	
+	nr_generate_Msg2(module_idP, 0/*CC_id*/,
+			 frame_txP,
+			 slot_txP);
+      }
+    }
+    
     // Phytest scheduling
     if (UE_list->fiveG_connected[UE_id] && (is_xlsch_in_slot(*dlsch_in_slot_bitmap,slot_txP%num_slots_per_tdd))) {
       ue_sched_ctl->current_harq_pid = slot_txP % num_slots_per_tdd;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -435,8 +435,11 @@ void nr_add_msg3(module_id_t module_idP, int CC_id, frame_t frameP, sub_frame_t
   NR_UE_list_t                               *UE_list = &mac->UE_list;
   int UE_id = 0;
 
-  AssertFatal(ra->state != RA_IDLE, "RA is not active for RA %X\n", ra->rnti);
-
+  if (ra->state != RA_IDLE) {
+    LOG_W(MAC,"RA is not active for RA %X. skipping msg3 scheduling\n", ra->rnti);
+    return;
+  }
+  
   LOG_D(MAC, "[gNB %d][RAPROC] Frame %d, Subframe %d : CC_id %d RA is active, Msg3 in (%d,%d)\n", module_idP, frameP, slotP, CC_id, ra->Msg3_frame, ra->Msg3_slot);
 
   nfapi_nr_pusch_pdu_t  *pusch_pdu = &ra->pusch_pdu;