addressing review comments

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -224,7 +224,8 @@ void configure_dlsch(NR_UE_DLSCH_t *dlsch0,
   LOG_D(PHY,"current_harq_pid = %d\n", current_harq_pid);
 
   NR_DL_UE_HARQ_t *dlsch0_harq = dlsch0->harq_processes[current_harq_pid];
-  if (dlsch0_harq){
+  AssertFatal(dlsch0_harq, "no harq_process for HARQ PID %d\n", current_harq_pid);
+
   dlsch0_harq->BWPStart = dlsch_config_pdu->BWPStart;
   dlsch0_harq->BWPSize = dlsch_config_pdu->BWPSize;
   dlsch0_harq->nb_rb = dlsch_config_pdu->number_rbs;
@@ -260,7 +261,6 @@ void configure_dlsch(NR_UE_DLSCH_t *dlsch0,
   dlsch0_harq->PTRSReOffset = dlsch_config_pdu->PTRSReOffset;
   dlsch0_harq->pduBitmap = dlsch_config_pdu->pduBitmap;
   LOG_D(MAC, ">>>> \tdlsch0->g_pucch = %d\tdlsch0_harq.mcs = %d\n", dlsch0->g_pucch, dlsch0_harq->mcs);
-  }
 }
 
 int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -2339,8 +2339,8 @@ void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, in
 
 void nr_schedule_csi_for_im(NR_UE_MAC_INST_t *mac, int frame, int slot) {
 
-  if (mac->ra.ra_state == RA_SUCCEEDED ||
-      get_softmodem_params()->phy_test == 1) {
+  if (mac->ra.ra_state != RA_SUCCEEDED && get_softmodem_params()->phy_test == 0)
+    return;
 
   NR_CellGroupConfig_t *CellGroup = mac->cg;
 
@@ -2364,7 +2364,8 @@ void nr_schedule_csi_for_im(NR_UE_MAC_INST_t *mac, int frame, int slot) {
   for (int id = 0; id < csi_measconfig->csi_IM_ResourceToAddModList->list.count; id++){
     imcsi = csi_measconfig->csi_IM_ResourceToAddModList->list.array[id];
     csi_period_offset(NULL,imcsi->periodicityAndOffset,&period,&offset);
-      if((frame*nr_slots_per_frame[mu]+slot-offset)%period == 0) {
+    if((frame*nr_slots_per_frame[mu]+slot-offset)%period != 0)
+      continue;
     fapi_nr_dl_config_csiim_pdu_rel15_t *csiim_config_pdu = &dl_config->dl_config_list[dl_config->number_pdus].csiim_config_pdu.csiim_config_rel15;
     const NR_BWP_Downlink_t *dlbwp = mac->DLbwp[dl_bwp_id-1];
     const int locationAndBandwidth = dlbwp != NULL ? dlbwp->bwp_Common->genericParameters.locationAndBandwidth:
@@ -2394,14 +2395,12 @@ void nr_schedule_csi_for_im(NR_UE_MAC_INST_t *mac, int frame, int slot) {
     dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_CSI_IM;
     dl_config->number_pdus = dl_config->number_pdus + 1;
   }
-    }
-  }
 }
 
 void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) {
 
-  if (mac->ra.ra_state == RA_SUCCEEDED ||
-      get_softmodem_params()->phy_test == 1) {
+  if (mac->ra.ra_state != RA_SUCCEEDED && get_softmodem_params()->phy_test == 0)
+    return;
 
   NR_CellGroupConfig_t *CellGroup = mac->cg;
 
@@ -2425,7 +2424,8 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) {
   for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
     nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
     csi_period_offset(NULL,nzpcsi->periodicityAndOffset,&period,&offset);
-      if((frame*nr_slots_per_frame[mu]+slot-offset)%period == 0) {
+    if((frame*nr_slots_per_frame[mu]+slot-offset)%period != 0)
+      continue;
     LOG_D(MAC,"Scheduling reception of CSI-RS in frame %d slot %d\n",frame,slot);
     fapi_nr_dl_config_csirs_pdu_rel15_t *csirs_config_pdu = &dl_config->dl_config_list[dl_config->number_pdus].csirs_config_pdu.csirs_config_rel15;
 
@@ -2531,8 +2531,6 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot) {
     dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_CSI_RS;
     dl_config->number_pdus = dl_config->number_pdus + 1;
   }
-    }
-  }
 }