addressing review comments

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -224,43 +224,43 @@ 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){
-    dlsch0_harq->BWPStart = dlsch_config_pdu->BWPStart;
-    dlsch0_harq->BWPSize = dlsch_config_pdu->BWPSize;
-    dlsch0_harq->nb_rb = dlsch_config_pdu->number_rbs;
-    dlsch0_harq->start_rb = dlsch_config_pdu->start_rb;
-    dlsch0_harq->nb_symbols = dlsch_config_pdu->number_symbols;
-    dlsch0_harq->start_symbol = dlsch_config_pdu->start_symbol;
-    dlsch0_harq->dlDmrsSymbPos = dlsch_config_pdu->dlDmrsSymbPos;
-    dlsch0_harq->dmrsConfigType = dlsch_config_pdu->dmrsConfigType;
-    dlsch0_harq->n_dmrs_cdm_groups = dlsch_config_pdu->n_dmrs_cdm_groups;
-    dlsch0_harq->dmrs_ports = dlsch_config_pdu->dmrs_ports;
-    dlsch0_harq->mcs = dlsch_config_pdu->mcs;
-    dlsch0_harq->rvidx = dlsch_config_pdu->rv;
-    dlsch0->g_pucch = dlsch_config_pdu->accumulated_delta_PUCCH;
-    //get nrOfLayers from DCI info
-    uint8_t Nl = 0;
-    for (int i = 0; i < 12; i++) { // max 12 ports
-      if ((dlsch_config_pdu->dmrs_ports>>i)&0x01) Nl += 1;
-    }
-    dlsch0_harq->Nl = Nl;
-    dlsch0_harq->mcs_table=dlsch_config_pdu->mcs_table;
-    downlink_harq_process(dlsch0_harq, dlsch0->current_harq_pid, dlsch_config_pdu->ndi, dlsch_config_pdu->rv, dlsch0->rnti_type);
-    if (dlsch0_harq->status != ACTIVE) {
-      // dlsch0_harq->status not ACTIVE due to false retransmission
-      // Reset the following flag to skip PDSCH procedures in that case and retrasmit harq status
-      dlsch0->active = 0;
-      update_harq_status(module_id,dlsch0->current_harq_pid,dlsch0_harq->ack);
-    }
-    /* PTRS */
-    dlsch0_harq->PTRSFreqDensity = dlsch_config_pdu->PTRSFreqDensity;
-    dlsch0_harq->PTRSTimeDensity = dlsch_config_pdu->PTRSTimeDensity;
-    dlsch0_harq->PTRSPortIndex = dlsch_config_pdu->PTRSPortIndex;
-    dlsch0_harq->nEpreRatioOfPDSCHToPTRS = dlsch_config_pdu->nEpreRatioOfPDSCHToPTRS;
-    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);
+  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;
+  dlsch0_harq->start_rb = dlsch_config_pdu->start_rb;
+  dlsch0_harq->nb_symbols = dlsch_config_pdu->number_symbols;
+  dlsch0_harq->start_symbol = dlsch_config_pdu->start_symbol;
+  dlsch0_harq->dlDmrsSymbPos = dlsch_config_pdu->dlDmrsSymbPos;
+  dlsch0_harq->dmrsConfigType = dlsch_config_pdu->dmrsConfigType;
+  dlsch0_harq->n_dmrs_cdm_groups = dlsch_config_pdu->n_dmrs_cdm_groups;
+  dlsch0_harq->dmrs_ports = dlsch_config_pdu->dmrs_ports;
+  dlsch0_harq->mcs = dlsch_config_pdu->mcs;
+  dlsch0_harq->rvidx = dlsch_config_pdu->rv;
+  dlsch0->g_pucch = dlsch_config_pdu->accumulated_delta_PUCCH;
+  //get nrOfLayers from DCI info
+  uint8_t Nl = 0;
+  for (int i = 0; i < 12; i++) { // max 12 ports
+    if ((dlsch_config_pdu->dmrs_ports>>i)&0x01) Nl += 1;
+  }
+  dlsch0_harq->Nl = Nl;
+  dlsch0_harq->mcs_table=dlsch_config_pdu->mcs_table;
+  downlink_harq_process(dlsch0_harq, dlsch0->current_harq_pid, dlsch_config_pdu->ndi, dlsch_config_pdu->rv, dlsch0->rnti_type);
+  if (dlsch0_harq->status != ACTIVE) {
+    // dlsch0_harq->status not ACTIVE due to false retransmission
+    // Reset the following flag to skip PDSCH procedures in that case and retrasmit harq status
+    dlsch0->active = 0;
+    update_harq_status(module_id,dlsch0->current_harq_pid,dlsch0_harq->ack);
   }
+  /* PTRS */
+  dlsch0_harq->PTRSFreqDensity = dlsch_config_pdu->PTRSFreqDensity;
+  dlsch0_harq->PTRSTimeDensity = dlsch_config_pdu->PTRSTimeDensity;
+  dlsch0_harq->PTRSPortIndex = dlsch_config_pdu->PTRSPortIndex;
+  dlsch0_harq->nEpreRatioOfPDSCHToPTRS = dlsch_config_pdu->nEpreRatioOfPDSCHToPTRS;
+  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){