Avoid multiple transmissions in the RA-Msg4 slot

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -438,7 +438,13 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
   }
 
   // This schedules the DCI for Downlink and PDSCH
-  if (is_xlsch_in_slot(dlsch_in_slot_bitmap, slot))
+  bool tx_ra_msg4 = false;
+  for (int i = 0; i < NR_NB_RA_PROC_MAX; i++) {
+    if(cc->ra[i].state == Msg4 && cc->ra[i].Msg4_frame==frame && cc->ra[i].Msg4_slot==slot) {
+      tx_ra_msg4 = true;
+    }
+  }
+  if ( is_xlsch_in_slot(dlsch_in_slot_bitmap, slot) && tx_ra_msg4 == false )
     nr_schedule_ue_spec(module_idP, frame, slot);
 
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -1282,12 +1282,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
 }
 
 void nr_check_Msg4_Ack(module_id_t module_id, int CC_id, frame_t frame, sub_frame_t slot, NR_RA_t *ra) {
-
   LOG_W(NR_MAC,"nr_check_Msg4_Ack() is not implemented yet!\n");
-
-  gNB_MAC_INST *nr_mac = RC.nrmac[module_id];
-  NR_COMMON_channels_t *cc = &nr_mac->common_channels[CC_id];
-
   ra->state = RA_IDLE;
 }