cleaning up of dci functions

2022-12-27 18:32:30 +01:00
parent 1e6db77be7
commit e55e880b71
19 changed files with 340 additions and 386 deletions
@@ -1012,7 +1012,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
    long maxMIMO_Layers = current_BWP->pdsch_servingcellconfig ? *current_BWP->pdsch_servingcellconfig->ext1->maxMIMO_Layers : 1;
    const int nl_tbslbrm = min(maxMIMO_Layers, 4);
    // Maximum number of PRBs across all configured DL BWPs
-    int scc_bwpsize = NRRIV2BW(scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
+    int scc_bwpsize = current_BWP->initial_BWPSize;
    int bw_tbslbrm = get_dlbw_tbslbrm(scc_bwpsize, cg);
    pdsch_pdu->maintenance_parms_v3.tbSizeLbrmBytes = nr_compute_tbslbrm(current_BWP->mcsTableIdx,
                                                                         bw_tbslbrm,
@@ -1110,12 +1110,13 @@ void nr_schedule_ue_spec(module_id_t module_id,
    fill_dci_pdu_rel15(scc,
                       cg,
                       current_BWP,
+                       &UE->current_UL_BWP,
                       dci_pdu,
                       &dci_payload,
                       current_BWP->dci_format,
                       rnti_type,
-                       pdsch_pdu->BWPSize,
                       bwp_id,
+                       sched_ctrl->search_space,
                       sched_ctrl->coreset,
                       gNB_mac->cset0_bwp_size);