some refactoring in dci configuration

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -96,9 +96,6 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
                     const NR_SearchSpace_t *ss)
 {
 
-  uint16_t monitoringSymbolsWithinSlot = 0;
-  int sps = 0;
-
   const NR_UE_DL_BWP_t *current_DL_BWP = &mac->current_DL_BWP;
   const NR_UE_UL_BWP_t *current_UL_BWP = &mac->current_UL_BWP;
   NR_BWP_Id_t dl_bwp_id = current_DL_BWP ? current_DL_BWP->bwp_id : 0;
@@ -187,16 +184,20 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
                                                mac->cg,
                                                &mac->def_dci_pdu_rel15[dl_config->slot][dci_format],
                                                dci_format,
-                                               NR_RNTI_TC,
+                                               rnti_type,
                                                coreset,
                                                dl_bwp_id,
                                                ss->searchSpaceType->present,
                                                mac->type0_PDCCH_CSS_config.num_rbs,
                                                alt_size);
+  }
 
   rel15->BWPStart = coreset_id == 0 ? mac->type0_PDCCH_CSS_config.cset_start_rb : current_DL_BWP->BWPStart;
   rel15->BWPSize = coreset_id == 0 ? mac->type0_PDCCH_CSS_config.num_rbs : current_DL_BWP->BWPSize;
 
+  uint16_t monitoringSymbolsWithinSlot = 0;
+  int sps = 0;
+
   switch(rnti_type) {
     case NR_RNTI_C:
       // we use DL BWP dedicated
@@ -230,9 +231,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
       sps=14;
       // for SPS=14 8 MSBs in positions 13 down to 6
       monitoringSymbolsWithinSlot = (ss->monitoringSymbolsWithinSlot->buf[0]<<(sps-8)) | (ss->monitoringSymbolsWithinSlot->buf[1]>>(16-sps));
-
       rel15->rnti = SI_RNTI; // SI-RNTI - 3GPP TS 38.321 Table 7.1-1: RNTI values
-
       rel15->SubcarrierSpacing = mac->mib->subCarrierSpacingCommon;
       if(mac->frequency_range == FR2)
         rel15->SubcarrierSpacing = mac->mib->subCarrierSpacingCommon + 2;
@@ -250,7 +249,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
     default:
       break;
   }
-  }
+
   for (int i = 0; i < sps; i++) {
     if ((monitoringSymbolsWithinSlot >> (sps - 1 - i)) & 1) {
       rel15->coreset.StartSymbolIndex = i;
@@ -263,15 +262,17 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
   fill_dci_search_candidates(ss, rel15, Y);
 
   #ifdef DEBUG_DCI
+    for (int i = 0; i < rel15->num_dci_options; i++) {
       LOG_D(MAC, "[DCI_CONFIG] Configure DCI PDU: rnti_type %d BWPSize %d BWPStart %d rel15->SubcarrierSpacing %d rel15->dci_format %d rel15->dci_length %d sps %d monitoringSymbolsWithinSlot %d \n",
             rnti_type,
             rel15->BWPSize,
             rel15->BWPStart,
             rel15->SubcarrierSpacing,
-      rel15->dci_format_options[0],
-      rel15->dci_length_options[0],
+            rel15->dci_format_options[i],
+            rel15->dci_length_options[i],
             sps,
             monitoringSymbolsWithinSlot);
+    }
   #endif
   // add DCI
   dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DCI;