diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 96e5d3a1980a82811c5a318c85ae1ff0a67704e1..99a14ea4976a746c9658be3116c785f5d81a65b4 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -793,27 +793,46 @@ void nr_generate_Msg2(module_id_t module_idP,
if ((ra->Msg2_frame == frameP) && (ra->Msg2_slot == slotP)) {
nfapi_nr_dl_tti_request_body_t *dl_req = &nr_mac->DL_req[CC_id].dl_tti_request_body;
+ // Checking if the DCI allocation is feasible in current subframe
+ if (dl_req->nPDUs > NFAPI_NR_MAX_DL_TTI_PDUS - 2) {
+ LOG_I(MAC, "[RAPROC] Subframe %d: FAPI DL structure is full, skip scheduling UE %d\n", slotP, RA_rnti);
+ return;
+ }
+
+ uint8_t nr_of_candidates, aggregation_level;
+ find_aggregation_candidates(&aggregation_level, &nr_of_candidates, ss);
+ NR_BWP_Downlink_t *bwp = ra->secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[ra->bwp_id - 1];
+ NR_ControlResourceSet_t *coreset = get_coreset(bwp, ss, 0 /* common */);
+ int CCEIndex = allocate_nr_CCEs(nr_mac,
+ bwp,
+ coreset,
+ aggregation_level,
+ 0, // Y
+ 0, // m
+ nr_of_candidates);
+
+ if (CCEIndex < 0) {
+ LOG_E(MAC, "%s(): cannot find free CCE for RA RNTI %04x!\n", __func__, ra->rnti);
+ return;
+ }
+
nfapi_nr_pdu_t *tx_req = &nr_mac->TX_req[CC_id].pdu_list[nr_mac->TX_req[CC_id].Number_of_PDUs];
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdcch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset((void*)dl_tti_pdcch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
dl_tti_pdcch_pdu->PDUType = NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE;
dl_tti_pdcch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
+ dl_req->nPDUs += 1;
+ nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15 = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
+ nr_configure_pdcch(pdcch_pdu_rel15, ss, coreset, scc, bwp);
- nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs+1];
+ nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset((void *)dl_tti_pdsch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
dl_tti_pdsch_pdu->PDUType = NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE;
dl_tti_pdsch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdsch_pdu));
-
- nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15 = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
+ dl_req->nPDUs+=1;
nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdsch_pdu_rel15 = &dl_tti_pdsch_pdu->pdsch_pdu.pdsch_pdu_rel15;
- // Checking if the DCI allocation is feasible in current subframe
- if (dl_req->nPDUs == NFAPI_NR_MAX_DL_TTI_PDUS) {
- LOG_I(MAC, "[RAPROC] Subframe %d: FAPI DL structure is full, skip scheduling UE %d\n", slotP, RA_rnti);
- return;
- }
-
LOG_I(MAC,"[gNB %d] [RAPROC] CC_id %d Frame %d, slotP %d: Generating RAR DCI, state %d\n", module_idP, CC_id, frameP, slotP, ra->state);
// This code from this point on will not work on initialBWP or CORESET0
@@ -824,7 +843,6 @@ void nr_generate_Msg2(module_id_t module_idP,
ra->crnti);
AssertFatal(ra->secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count == 1,
"downlinkBWP_ToAddModList has %d BWP!\n", ra->secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count);
- NR_BWP_Downlink_t *bwp = ra->secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[ra->bwp_id - 1];
NR_BWP_Uplink_t *ubwp=ra->secondaryCellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.array[ra->bwp_id-1];
LOG_I(MAC, "[RAPROC] Scheduling common search space DCI type 1 dlBWP BW %d\n", dci10_bw);
@@ -887,49 +905,38 @@ void nr_generate_Msg2(module_id_t module_idP,
pdsch_pdu_rel15->NrOfSymbols = NrOfSymbols;
pdsch_pdu_rel15->dlDmrsSymbPos = fill_dmrs_mask(NULL, scc->dmrs_TypeA_Position, NrOfSymbols);
- dci_pdu_rel15_t dci_pdu_rel15;
- dci_pdu_rel15.frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(pdsch_pdu_rel15->rbSize,
+ /* Fill PDCCH DL DCI PDU */
+ nfapi_nr_dl_dci_pdu_t *dci_pdu = &pdcch_pdu_rel15->dci_pdu[pdcch_pdu_rel15->numDlDci];
+ pdcch_pdu_rel15->numDlDci++;
+ dci_pdu->RNTI = RA_rnti;
+ /* TODO: remove next line */
+ AssertFatal(ss->searchSpaceType->present != NR_SearchSpace__searchSpaceType_PR_ue_Specific,
+ "shouldn't the RA SS be common?\n");
+ dci_pdu->ScramblingId = *scc->physCellId;
+ dci_pdu->ScramblingRNTI = 0;
+ dci_pdu->AggregationLevel = aggregation_level;
+ dci_pdu->CceIndex = CCEIndex;
+ dci_pdu->beta_PDCCH_1_0 = 0;
+ dci_pdu->powerControlOffsetSS = 1;
+
+ dci_pdu_rel15_t dci_payload;
+ dci_payload.frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(pdsch_pdu_rel15->rbSize,
pdsch_pdu_rel15->rbStart,dci10_bw);
- dci_pdu_rel15.time_domain_assignment.val = time_domain_assignment;
- dci_pdu_rel15.vrb_to_prb_mapping.val = 0;
- dci_pdu_rel15.mcs = pdsch_pdu_rel15->mcsIndex[0];
- dci_pdu_rel15.tb_scaling = 0;
+ dci_payload.time_domain_assignment.val = time_domain_assignment;
+ dci_payload.vrb_to_prb_mapping.val = 0;
+ dci_payload.mcs = pdsch_pdu_rel15->mcsIndex[0];
+ dci_payload.tb_scaling = 0;
LOG_I(MAC,
"[RAPROC] DCI type 1 payload: freq_alloc %d (%d,%d,%d), time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d \n",
- dci_pdu_rel15.frequency_domain_assignment.val,
+ dci_payload.frequency_domain_assignment.val,
pdsch_pdu_rel15->rbStart,
pdsch_pdu_rel15->rbSize,
dci10_bw,
- dci_pdu_rel15.time_domain_assignment.val,
- dci_pdu_rel15.vrb_to_prb_mapping.val,
- dci_pdu_rel15.mcs,
- dci_pdu_rel15.tb_scaling);
-
- uint8_t nr_of_candidates, aggregation_level;
- find_aggregation_candidates(&aggregation_level, &nr_of_candidates, ss);
- NR_ControlResourceSet_t *coreset = get_coreset(bwp, ss, 0 /* common */);
- int CCEIndex = allocate_nr_CCEs(nr_mac,
- bwp,
- coreset,
- aggregation_level,
- 0, // Y
- 0, // m
- nr_of_candidates);
-
- if (CCEIndex < 0) {
- LOG_E(MAC, "%s(): cannot find free CCE for RA RNTI %04x!\n", __func__, ra->rnti);
- return;
- }
- nr_configure_pdcch(nr_mac,
- pdcch_pdu_rel15,
- RA_rnti,
- ss,
- coreset,
- scc,
- bwp,
- aggregation_level,
- CCEIndex);
+ dci_payload.time_domain_assignment.val,
+ dci_payload.vrb_to_prb_mapping.val,
+ dci_payload.mcs,
+ dci_payload.tb_scaling);
LOG_I(MAC, "Frame %d: Subframe %d : Adding common DL DCI for RA_RNTI %x\n", frameP, slotP, RA_rnti);
@@ -945,18 +952,15 @@ void nr_generate_Msg2(module_id_t module_idP,
pdcch_pdu_rel15->StartSymbolIndex,
pdcch_pdu_rel15->DurationSymbols);
- // nr_configure_pdcch() increased numDlDci, so we use numDlDci - 1
fill_dci_pdu_rel15(scc,
ra->secondaryCellGroup,
- &pdcch_pdu_rel15->dci_pdu[pdcch_pdu_rel15->numDlDci - 1],
- &dci_pdu_rel15,
+ dci_pdu,
+ &dci_payload,
dci_format,
rnti_type,
dci10_bw,
ra->bwp_id);
- dl_req->nPDUs+=2;
-
// Program UL processing for Msg3
nr_get_Msg3alloc(module_idP, CC_id, scc, ubwp, slotP, frameP, ra);
LOG_I(MAC, "Frame %d, Subframe %d: Setting Msg3 reception for Frame %d Subframe %d\n", frameP, slotP, ra->Msg3_frame, ra->Msg3_slot);
@@ -965,7 +969,7 @@ void nr_generate_Msg2(module_id_t module_idP,
LOG_I(MAC,"[gNB %d][RAPROC] Frame %d, Subframe %d: RA state %d\n", module_idP, frameP, slotP, ra->state);
x_Overhead = 0;
- nr_get_tbs_dl(&dl_tti_pdsch_pdu->pdsch_pdu, x_Overhead, pdsch_pdu_rel15->numDmrsCdmGrpsNoData, dci_pdu_rel15.tb_scaling);
+ nr_get_tbs_dl(&dl_tti_pdsch_pdu->pdsch_pdu, x_Overhead, pdsch_pdu_rel15->numDmrsCdmGrpsNoData, dci_payload.tb_scaling);
// DL TX request
tx_req->PDU_length = pdsch_pdu_rel15->TBSize[0];
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
index cddc3bb60eecd5cd284a1c8782f0b0228de1c9cf..4d6ef6689b4162c894cdfa238eda4d37c03171b3 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
@@ -331,13 +331,19 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
memset((void*)dl_tti_pdcch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
dl_tti_pdcch_pdu->PDUType = NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE;
dl_tti_pdcch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
+ dl_req->nPDUs += 1;
+ nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15 = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
+ nr_configure_pdcch(pdcch_pdu_rel15,
+ gNB_mac->sched_ctrlCommon->search_space,
+ gNB_mac->sched_ctrlCommon->coreset,
+ scc,
+ bwp);
- nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs+1];
+ nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset((void*)dl_tti_pdsch_pdu,0,sizeof(nfapi_nr_dl_tti_request_pdu_t));
dl_tti_pdsch_pdu->PDUType = NFAPI_NR_DL_TTI_PDSCH_PDU_TYPE;
dl_tti_pdsch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdsch_pdu));
-
- nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15 = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
+ dl_req->nPDUs += 1;
nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdsch_pdu_rel15 = &dl_tti_pdsch_pdu->pdsch_pdu.pdsch_pdu_rel15;
pdcch_pdu_rel15->CoreSetType = NFAPI_NR_CSET_CONFIG_MIB_SIB1;
@@ -385,36 +391,38 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
LOG_D(MAC,"dlDmrsSymbPos = 0x%x\n", pdsch_pdu_rel15->dlDmrsSymbPos);
- dci_pdu_rel15_t dci_pdu_rel15;
- memset(&dci_pdu_rel15, 0, sizeof(dci_pdu_rel15_t));
+ /* Fill PDCCH DL DCI PDU */
+ nfapi_nr_dl_dci_pdu_t *dci_pdu = &pdcch_pdu_rel15->dci_pdu[pdcch_pdu_rel15->numDlDci];
+ pdcch_pdu_rel15->numDlDci++;
+ dci_pdu->RNTI = SI_RNTI;
+ dci_pdu->ScramblingId = *scc->physCellId;
+ dci_pdu->ScramblingRNTI = 0;
+ dci_pdu->AggregationLevel = gNB_mac->sched_ctrlCommon->aggregation_level;
+ dci_pdu->CceIndex = gNB_mac->sched_ctrlCommon->cce_index;
+ dci_pdu->beta_PDCCH_1_0 = 0;
+ dci_pdu->powerControlOffsetSS = 1;
- dci_pdu_rel15.bwp_indicator.val = gNB_mac->sched_ctrlCommon->active_bwp->bwp_Id;
+ /* DCI payload */
+ dci_pdu_rel15_t dci_payload;
+ memset(&dci_payload, 0, sizeof(dci_pdu_rel15_t));
+
+ dci_payload.bwp_indicator.val = gNB_mac->sched_ctrlCommon->active_bwp->bwp_Id;
// frequency domain assignment
- dci_pdu_rel15.frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(
+ dci_payload.frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(
pdsch_pdu_rel15->rbSize, pdsch_pdu_rel15->rbStart, gNB_mac->type0_PDCCH_CSS_config.num_rbs);
- dci_pdu_rel15.time_domain_assignment.val = gNB_mac->sched_ctrlCommon->time_domain_allocation;
- dci_pdu_rel15.mcs = gNB_mac->sched_ctrlCommon->mcs;
- dci_pdu_rel15.rv = pdsch_pdu_rel15->rvIndex[0];
- dci_pdu_rel15.harq_pid = 0;
- dci_pdu_rel15.ndi = 0;
- dci_pdu_rel15.dai[0].val = 0;
- dci_pdu_rel15.tpc = 0; // table 7.2.1-1 in 38.213
- dci_pdu_rel15.pucch_resource_indicator = 0;
- dci_pdu_rel15.pdsch_to_harq_feedback_timing_indicator.val = 0;
- dci_pdu_rel15.antenna_ports.val = 0;
- dci_pdu_rel15.dmrs_sequence_initialization.val = pdsch_pdu_rel15->SCID;
-
- nr_configure_pdcch(gNB_mac,
- pdcch_pdu_rel15,
- SI_RNTI,
- gNB_mac->sched_ctrlCommon->search_space,
- gNB_mac->sched_ctrlCommon->coreset,
- scc,
- bwp,
- gNB_mac->sched_ctrlCommon->aggregation_level,
- gNB_mac->sched_ctrlCommon->cce_index);
+ dci_payload.time_domain_assignment.val = gNB_mac->sched_ctrlCommon->time_domain_allocation;
+ dci_payload.mcs = gNB_mac->sched_ctrlCommon->mcs;
+ dci_payload.rv = pdsch_pdu_rel15->rvIndex[0];
+ dci_payload.harq_pid = 0;
+ dci_payload.ndi = 0;
+ dci_payload.dai[0].val = 0;
+ dci_payload.tpc = 0; // table 7.2.1-1 in 38.213
+ dci_payload.pucch_resource_indicator = 0;
+ dci_payload.pdsch_to_harq_feedback_timing_indicator.val = 0;
+ dci_payload.antenna_ports.val = 0;
+ dci_payload.dmrs_sequence_initialization.val = pdsch_pdu_rel15->SCID;
int dci_format = NR_DL_DCI_FORMAT_1_0;
int rnti_type = NR_RNTI_SI;
@@ -422,14 +430,12 @@ void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
fill_dci_pdu_rel15(scc,
secondaryCellGroup,
&pdcch_pdu_rel15->dci_pdu[pdcch_pdu_rel15->numDlDci - 1],
- &dci_pdu_rel15,
+ &dci_payload,
dci_format,
rnti_type,
pdsch_pdu_rel15->BWPSize,
gNB_mac->sched_ctrlCommon->active_bwp->bwp_Id);
- dl_req->nPDUs += 2;
-
LOG_D(MAC,"BWPSize: %i\n", pdcch_pdu_rel15->BWPSize);
LOG_D(MAC,"BWPStart: %i\n", pdcch_pdu_rel15->BWPStart);
LOG_D(MAC,"SubcarrierSpacing: %i\n", pdcch_pdu_rel15->SubcarrierSpacing);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index 1f088d668a2c22691b454b5bece39c3768b779a0..a1f2920d10142bad3cf5581f6af022639ad804f9 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -630,16 +630,15 @@ void nr_schedule_ue_spec(module_id_t module_id,
AssertFatal(bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList->list.count > 0,
"searchSPacesToAddModList is empty\n");
-
nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
- /* TODO: can be moved down? */
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdcch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset(dl_tti_pdcch_pdu, 0, sizeof(nfapi_nr_dl_tti_request_pdu_t));
dl_tti_pdcch_pdu->PDUType = NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE;
dl_tti_pdcch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
dl_req->nPDUs += 1;
nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
+ nr_configure_pdcch(pdcch_pdu, sched_ctrl->search_space, sched_ctrl->coreset, scc, bwp);
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu = &dl_req->dl_tti_pdu_list[dl_req->nPDUs];
memset(dl_tti_pdsch_pdu, 0, sizeof(nfapi_nr_dl_tti_request_pdu_t));
@@ -714,69 +713,75 @@ void nr_schedule_ue_spec(module_id_t module_id,
pdsch_pdu->pduBitmap |= 0x1; // Bit 0: pdschPtrs - Indicates PTRS included (FR2)
}
- dci_pdu_rel15_t dci_pdu;
- memset(&dci_pdu, 0, sizeof(dci_pdu_rel15_t));
-
+ /* Fill PDCCH DL DCI PDU */
+ nfapi_nr_dl_dci_pdu_t *dci_pdu = &pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci];
+ pdcch_pdu->numDlDci++;
+ dci_pdu->RNTI = rnti;
+ if (sched_ctrl->coreset->pdcch_DMRS_ScramblingID &&
+ sched_ctrl->search_space->searchSpaceType->present == NR_SearchSpace__searchSpaceType_PR_ue_Specific) {
+ dci_pdu->ScramblingId = *sched_ctrl->coreset->pdcch_DMRS_ScramblingID;
+ dci_pdu->ScramblingRNTI = rnti;
+ } else {
+ dci_pdu->ScramblingId = *scc->physCellId;
+ dci_pdu->ScramblingRNTI = 0;
+ }
+ dci_pdu->AggregationLevel = sched_ctrl->aggregation_level;
+ dci_pdu->CceIndex = sched_ctrl->cce_index;
+ dci_pdu->beta_PDCCH_1_0 = 0;
+ dci_pdu->powerControlOffsetSS = 1;
+
+ /* DCI payload */
+ dci_pdu_rel15_t dci_payload;
+ memset(&dci_payload, 0, sizeof(dci_pdu_rel15_t));
// bwp indicator
const int n_dl_bwp = UE_info->secondaryCellGroup[UE_id]->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count;
AssertFatal(n_dl_bwp == 1,
"downlinkBWP_ToAddModList has %d BWP!\n",
n_dl_bwp);
// as per table 7.3.1.1.2-1 in 38.212
- dci_pdu.bwp_indicator.val = n_dl_bwp < 4 ? bwp->bwp_Id : bwp->bwp_Id - 1;
+ dci_payload.bwp_indicator.val = n_dl_bwp < 4 ? bwp->bwp_Id : bwp->bwp_Id - 1;
AssertFatal(bwp->bwp_Dedicated->pdsch_Config->choice.setup->resourceAllocation == NR_PDSCH_Config__resourceAllocation_resourceAllocationType1,
"Only frequency resource allocation type 1 is currently supported\n");
- dci_pdu.frequency_domain_assignment.val =
+ dci_payload.frequency_domain_assignment.val =
PRBalloc_to_locationandbandwidth0(
pdsch_pdu->rbSize,
pdsch_pdu->rbStart,
pdsch_pdu->BWPSize);
- dci_pdu.time_domain_assignment.val = sched_ctrl->time_domain_allocation;
- dci_pdu.mcs = sched_ctrl->mcs;
- dci_pdu.rv = pdsch_pdu->rvIndex[0];
- dci_pdu.harq_pid = current_harq_pid;
- dci_pdu.ndi = harq->ndi;
- dci_pdu.dai[0].val = (pucch->dai_c-1)&3;
- dci_pdu.tpc = sched_ctrl->tpc1; // TPC for PUCCH: table 7.2.1-1 in 38.213
- dci_pdu.pucch_resource_indicator = pucch->resource_indicator;
- dci_pdu.pdsch_to_harq_feedback_timing_indicator.val = pucch->timing_indicator; // PDSCH to HARQ TI
- dci_pdu.antenna_ports.val = 0; // nb of cdm groups w/o data 1 and dmrs port 0
- dci_pdu.dmrs_sequence_initialization.val = pdsch_pdu->SCID;
+ dci_payload.time_domain_assignment.val = sched_ctrl->time_domain_allocation;
+ dci_payload.mcs = sched_ctrl->mcs;
+ dci_payload.rv = pdsch_pdu->rvIndex[0];
+ dci_payload.harq_pid = current_harq_pid;
+ dci_payload.ndi = harq->ndi;
+ dci_payload.dai[0].val = (pucch->dai_c-1)&3;
+ dci_payload.tpc = sched_ctrl->tpc1; // TPC for PUCCH: table 7.2.1-1 in 38.213
+ dci_payload.pucch_resource_indicator = pucch->resource_indicator;
+ dci_payload.pdsch_to_harq_feedback_timing_indicator.val = pucch->timing_indicator; // PDSCH to HARQ TI
+ dci_payload.antenna_ports.val = 0; // nb of cdm groups w/o data 1 and dmrs port 0
+ dci_payload.dmrs_sequence_initialization.val = pdsch_pdu->SCID;
LOG_D(MAC,
"%4d.%2d DCI type 1 payload: freq_alloc %d (%d,%d,%d), "
"time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d ndi %d rv %d\n",
frame,
slot,
- dci_pdu.frequency_domain_assignment.val,
+ dci_payload.frequency_domain_assignment.val,
pdsch_pdu->rbStart,
pdsch_pdu->rbSize,
pdsch_pdu->BWPSize,
- dci_pdu.time_domain_assignment.val,
- dci_pdu.vrb_to_prb_mapping.val,
- dci_pdu.mcs,
- dci_pdu.tb_scaling,
- dci_pdu.ndi,
- dci_pdu.rv);
-
- nr_configure_pdcch(gNB_mac,
- pdcch_pdu,
- rnti,
- sched_ctrl->search_space,
- sched_ctrl->coreset,
- scc,
- bwp,
- sched_ctrl->aggregation_level,
- sched_ctrl->cce_index);
+ dci_payload.time_domain_assignment.val,
+ dci_payload.vrb_to_prb_mapping.val,
+ dci_payload.mcs,
+ dci_payload.tb_scaling,
+ dci_payload.ndi,
+ dci_payload.rv);
const long f = sched_ctrl->search_space->searchSpaceType->choice.ue_Specific->dci_Formats;
const int dci_format = f ? NR_DL_DCI_FORMAT_1_1 : NR_DL_DCI_FORMAT_1_0;
const int rnti_type = NR_RNTI_C;
- // nr_configure_pdcch() increased numDlDci, so we use numDlDci - 1
fill_dci_pdu_rel15(scc,
UE_info->secondaryCellGroup[UE_id],
- &pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci - 1],
- &dci_pdu,
+ dci_pdu,
+ &dci_payload,
dci_format,
rnti_type,
pdsch_pdu->BWPSize,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 267402c0d016b1a91ef98e74e9fc6069cb36811a..c49ae10ca221dbbd19f2d714e50445b604405208 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -557,15 +557,12 @@ void config_uldci(const NR_BWP_Uplink_t *ubwp,
dci_pdu_rel15->rv);
}
-void nr_configure_pdcch(gNB_MAC_INST *nr_mac,
- nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
- uint16_t rnti,
+void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
NR_SearchSpace_t *ss,
NR_ControlResourceSet_t *coreset,
NR_ServingCellConfigCommon_t *scc,
- NR_BWP_Downlink_t *bwp,
- uint8_t aggregation_level,
- int CCEIndex) {
+ NR_BWP_Downlink_t *bwp)
+{
if (bwp) { // This is not the InitialBWP
pdcch_pdu->BWPSize = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
pdcch_pdu->BWPStart = NRRIV2PRBOFFSET(bwp->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
@@ -620,27 +617,6 @@ void nr_configure_pdcch(gNB_MAC_INST *nr_mac,
//precoderGranularity
pdcch_pdu->precoderGranularity = coreset->precoderGranularity;
-
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].RNTI = rnti;
-
- if (coreset->pdcch_DMRS_ScramblingID != NULL &&
- ss->searchSpaceType->present == NR_SearchSpace__searchSpaceType_PR_ue_Specific) {
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].ScramblingId = *coreset->pdcch_DMRS_ScramblingID;
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].ScramblingRNTI = rnti;
- }
- else {
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].ScramblingId = *scc->physCellId;
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].ScramblingRNTI = 0;
- }
-
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].AggregationLevel = aggregation_level;
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].CceIndex = CCEIndex;
-
- if (ss->searchSpaceType->choice.ue_Specific->dci_Formats==NR_SearchSpace__searchSpaceType__ue_Specific__dci_Formats_formats0_0_And_1_0)
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].beta_PDCCH_1_0 = 0;
-
- pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci].powerControlOffsetSS = 1;
- pdcch_pdu->numDlDci++;
}
else { // this is for InitialBWP
AssertFatal(1==0,"Fill in InitialBWP PDCCH configuration\n");
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index d30eb1dad405127054b46b95d80e41df1e2f27ab..44cbec27bdca563fdb5b15e540be226c61c6e3e7 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -787,28 +787,36 @@ void nr_schedule_ulsch(module_id_t module_id,
memset(ul_dci_request_pdu, 0, sizeof(nfapi_nr_ul_dci_request_pdus_t));
ul_dci_request_pdu->PDUType = NFAPI_NR_DL_TTI_PDCCH_PDU_TYPE;
ul_dci_request_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
- nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15 = &ul_dci_request_pdu->pdcch_pdu.pdcch_pdu_rel15;
+ nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu = &ul_dci_request_pdu->pdcch_pdu.pdcch_pdu_rel15;
ul_dci_req->numPdus += 1;
+ nr_configure_pdcch(pdcch_pdu, sched_ctrl->search_space, sched_ctrl->coreset, scc, sched_ctrl->active_bwp);
LOG_D(MAC,"Configuring ULDCI/PDCCH in %d.%d\n", frame,slot);
- nr_configure_pdcch(RC.nrmac[0],
- pdcch_pdu_rel15,
- rnti,
- sched_ctrl->search_space,
- sched_ctrl->coreset,
- scc,
- sched_ctrl->active_bwp,
- sched_ctrl->aggregation_level,
- sched_ctrl->cce_index);
-
- dci_pdu_rel15_t dci_pdu_rel15;
- memset(&dci_pdu_rel15, 0, sizeof(dci_pdu_rel15));
+ /* Fill PDCCH DL DCI PDU */
+ nfapi_nr_dl_dci_pdu_t *dci_pdu = &pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci];
+ pdcch_pdu->numDlDci++;
+ dci_pdu->RNTI = rnti;
+ if (sched_ctrl->coreset->pdcch_DMRS_ScramblingID &&
+ sched_ctrl->search_space->searchSpaceType->present == NR_SearchSpace__searchSpaceType_PR_ue_Specific) {
+ dci_pdu->ScramblingId = *sched_ctrl->coreset->pdcch_DMRS_ScramblingID;
+ dci_pdu->ScramblingRNTI = rnti;
+ } else {
+ dci_pdu->ScramblingId = *scc->physCellId;
+ dci_pdu->ScramblingRNTI = 0;
+ }
+ dci_pdu->AggregationLevel = sched_ctrl->aggregation_level;
+ dci_pdu->CceIndex = sched_ctrl->cce_index;
+ dci_pdu->beta_PDCCH_1_0 = 0;
+ dci_pdu->powerControlOffsetSS = 1;
+
+ dci_pdu_rel15_t uldci_payload;
+ memset(&uldci_payload, 0, sizeof(uldci_payload));
NR_CellGroupConfig_t *secondaryCellGroup = UE_info->secondaryCellGroup[UE_id];
const int n_ubwp = secondaryCellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.count;
config_uldci(sched_ctrl->active_ubwp,
pusch_pdu,
- &dci_pdu_rel15,
+ &uldci_payload,
ps->dci_format,
ps->time_domain_allocation,
UE_info->UE_sched_ctrl[UE_id].tpc0,
@@ -816,8 +824,8 @@ void nr_schedule_ulsch(module_id_t module_id,
sched_ctrl->active_bwp->bwp_Id);
fill_dci_pdu_rel15(scc,
secondaryCellGroup,
- &pdcch_pdu_rel15->dci_pdu[pdcch_pdu_rel15->numDlDci - 1],
- &dci_pdu_rel15,
+ dci_pdu,
+ &uldci_payload,
ps->dci_format,
rnti_types[0],
pusch_pdu->bwp_size,
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index d2d86e72fa6ae75f891a86ef7e65fe6b864c0952..2c5449affa2a9ddf8c966d38277436b34c29cfdb 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -242,15 +242,11 @@ void find_search_space(int ss_type,
NR_BWP_Downlink_t *bwp,
NR_SearchSpace_t *ss);
-void nr_configure_pdcch(gNB_MAC_INST *nr_mac,
- nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
- uint16_t rnti,
+void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu,
NR_SearchSpace_t *ss,
NR_ControlResourceSet_t *coreset,
NR_ServingCellConfigCommon_t *scc,
- NR_BWP_Downlink_t *bwp,
- uint8_t aggregation_level,
- int CCEIndex);
+ NR_BWP_Downlink_t *bwp);
void fill_dci_pdu_rel15(const NR_ServingCellConfigCommon_t *scc,
const NR_CellGroupConfig_t *secondaryCellGroup,