From c36636be9597c0aea2caa82ac9103d643fe7d6ac Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Mon, 3 Feb 2020 11:53:05 +0100
Subject: [PATCH] function to configure scf fapi for pucch (not yet called)
---
.../LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c | 16 +--
.../NR_MAC_gNB/gNB_scheduler_primitives.c | 135 ++++++++++++++++++
openair2/LAYER2/NR_MAC_gNB/mac_proto.h | 4 +
3 files changed, 144 insertions(+), 11 deletions(-)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index 32e8aedc064..2fe553a0551 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -262,14 +262,10 @@ int configure_fapi_dl_Tx(int Mod_idP,
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdcch_pdu;
nfapi_nr_dl_tti_request_pdu_t *dl_tti_pdsch_pdu;
int TBS;
-
-
int bwp_id=1;
-
int UE_id = 0;
NR_UE_list_t *UE_list = &RC.nrmac[Mod_idP]->UE_list;
-
NR_CellGroupConfig_t *secondaryCellGroup = UE_list->secondaryCellGroup[UE_id];
AssertFatal(secondaryCellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count == 1,
"downlinkBWP_ToAddModList has %d BWP!\n",
@@ -422,7 +418,6 @@ int configure_fapi_dl_Tx(int Mod_idP,
TBS);
dl_req->nPDUs+=2;
-
TX_req->PDU_length = pdsch_pdu_rel15->TBSize[0];
TX_req->PDU_index = nr_mac->pdu_index[0]++;
@@ -740,12 +735,12 @@ void nr_schedule_uss_ulsch_phytest(int Mod_idP,
UL_tti_req->SFN = frameP;
UL_tti_req->Slot = slotP;
- UL_tti_req->n_pdus = 1;
- UL_tti_req->pdus_list[0].pdu_type = NFAPI_NR_UL_CONFIG_PUSCH_PDU_TYPE;
- UL_tti_req->pdus_list[0].pdu_size = sizeof(nfapi_nr_pusch_pdu_t);
- nfapi_nr_pusch_pdu_t *pusch_pdu = &UL_tti_req->pdus_list[0].pusch_pdu;
+ UL_tti_req->pdus_list[UL_tti_req->n_pdus].pdu_type = NFAPI_NR_UL_CONFIG_PUSCH_PDU_TYPE;
+ UL_tti_req->pdus_list[UL_tti_req->n_pdus].pdu_size = sizeof(nfapi_nr_pusch_pdu_t);
+ nfapi_nr_pusch_pdu_t *pusch_pdu = &UL_tti_req->pdus_list[UL_tti_req->n_pdus].pusch_pdu;
memset(pusch_pdu,0,sizeof(nfapi_nr_pusch_pdu_t));
-
+ UL_tti_req->n_pdus+=1;
+
LOG_D(MAC, "Scheduling UE specific PUSCH\n");
//UL_tti_req = &nr_mac->UL_tti_req[CC_id];
/*
@@ -842,7 +837,6 @@ void nr_schedule_uss_ulsch_phytest(int Mod_idP,
1, // ue-specific,
scc,
bwp);
-
dci_pdu_rel15_t dci_pdu_rel15[MAX_DCI_CORESET];
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index df9c37f6871..273c09e2467 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -547,6 +547,141 @@ void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu,
}
+// This function configures pucch_pdu according to pucch_ResourceId value
+void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
+ NR_PUCCH_ResourceId_t pucch_ResourceId,
+ NR_ServingCellConfigCommon_t *scc,
+ NR_BWP_Uplink_t *bwp){
+
+ NR_PUCCH_Config_t *pucch_Config;
+ NR_PUCCH_Resource_t *pucchres;
+ NR_PUCCH_FormatConfig_t *pucchfmt;
+ NR_PUSCH_Config_t *pusch_Config = bwp->bwp_Dedicated->pusch_Config->choice.setup;
+ long *pusch_id = pusch_Config->dataScramblingIdentityPUSCH;
+ long *id0 = NULL;
+ int n_list;
+ if (pusch_Config->dmrs_UplinkForPUSCH_MappingTypeA != NULL)
+ id0 = pusch_Config->dmrs_UplinkForPUSCH_MappingTypeA->choice.setup->transformPrecodingDisabled->scramblingID0;
+ if (pusch_Config->dmrs_UplinkForPUSCH_MappingTypeB != NULL)
+ id0 = pusch_Config->dmrs_UplinkForPUSCH_MappingTypeB->choice.setup->transformPrecodingDisabled->scramblingID0;
+
+ // hop flags and hopping id are valid for any BWP
+ switch (scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->pucch_GroupHopping){
+ case 0 :
+ // if neither, both disabled
+ pucch_pdu->group_hop_flag = 0;
+ pucch_pdu->sequence_hop_flag = 0;
+ break;
+ case 1 :
+ // if enable, group enabled
+ pucch_pdu->group_hop_flag = 1;
+ pucch_pdu->sequence_hop_flag = 0;
+ break;
+ case 2 :
+ // if disable, sequence disabled
+ pucch_pdu->group_hop_flag = 0;
+ pucch_pdu->sequence_hop_flag = 1;
+ break;
+ default:
+ AssertFatal(1==0,"msg1 FDM identifier %ld undefined (0,1,2,3) \n", scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FDM);
+ }
+
+ if (scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->hoppingId != NULL)
+ pucch_pdu->hopping_id = *scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->hoppingId;
+ else
+ pucch_pdu->hopping_id = *scc->physCellId;
+
+ if (bwp) { // This is not the InitialBWP
+
+ pucch_pdu->bwp_size = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
+ pucch_pdu->bwp_start = NRRIV2PRBOFFSET(bwp->bwp_Common->genericParameters.locationAndBandwidth,275);
+ pucch_pdu->subcarrier_spacing = bwp->bwp_Common->genericParameters.subcarrierSpacing;
+ pucch_pdu->cyclic_prefix = (bwp->bwp_Common->genericParameters.cyclicPrefix==NULL) ? 0 : *bwp->bwp_Common->genericParameters.cyclicPrefix;
+
+ pucch_Config = bwp->bwp_Dedicated->pucch_Config->choice.setup;
+
+ AssertFatal(pucch_Config->resourceToAddModList!=NULL,
+ "PUCCH resourceToAddModList is null\n");
+
+ n_list = pucch_Config->resourceToAddModList->list.count;
+ AssertFatal(n_list>0,"PUCCH resourceToAddModList is empty\n");
+
+ for (int i=0; i<n_list; i++) {
+ pucchres = pucch_Config->resourceToAddModList->list.array[i];
+ if (pucchres->pucch_ResourceId == pucch_ResourceId) {
+ pucch_pdu->prb_start = pucchres->startingPRB;
+ pucch_pdu->freq_hop_flag = pucchres->intraSlotFrequencyHopping!= NULL ? 1 : 0;
+ pucch_pdu->second_hop_prb = pucchres->secondHopPRB!= NULL ? *pucchres->secondHopPRB : 0;
+
+ switch(pucchres->format.present) {
+ case NR_PUCCH_Resource__format_PR_format0 :
+ pucch_pdu->format_type = 0;
+ pucch_pdu->initial_cyclic_shift = pucchres->format.choice.format0->initialCyclicShift;
+ pucch_pdu->nr_of_symbols = pucchres->format.choice.format0->nrofSymbols;
+ pucch_pdu->start_symbol_index = pucchres->format.choice.format0->startingSymbolIndex;
+ break;
+ case NR_PUCCH_Resource__format_PR_format1 :
+ pucch_pdu->format_type = 1;
+ pucch_pdu->initial_cyclic_shift = pucchres->format.choice.format1->initialCyclicShift;
+ pucch_pdu->nr_of_symbols = pucchres->format.choice.format1->nrofSymbols;
+ pucch_pdu->start_symbol_index = pucchres->format.choice.format1->startingSymbolIndex;
+ pucch_pdu->time_domain_occ_idx = pucchres->format.choice.format1->timeDomainOCC;
+ break;
+ case NR_PUCCH_Resource__format_PR_format2 :
+ pucch_pdu->format_type = 2;
+ pucch_pdu->nr_of_symbols = pucchres->format.choice.format2->nrofSymbols;
+ pucch_pdu->start_symbol_index = pucchres->format.choice.format2->startingSymbolIndex;
+ pucch_pdu->prb_size = pucchres->format.choice.format2->nrofPRBs;
+ pucch_pdu->data_scrambling_id = pusch_id!= NULL ? *pusch_id : *scc->physCellId;
+ pucch_pdu->dmrs_scrambling_id = id0!= NULL ? *id0 : *scc->physCellId;
+ break;
+ case NR_PUCCH_Resource__format_PR_format3 :
+ pucch_pdu->format_type = 3;
+ pucch_pdu->nr_of_symbols = pucchres->format.choice.format3->nrofSymbols;
+ pucch_pdu->start_symbol_index = pucchres->format.choice.format3->startingSymbolIndex;
+ pucch_pdu->prb_size = pucchres->format.choice.format3->nrofPRBs;
+ pucch_pdu->data_scrambling_id = pusch_id!= NULL ? *pusch_id : *scc->physCellId;
+ if (pucch_Config->format3 == NULL) {
+ pucch_pdu->pi_2bpsk = 0;
+ pucch_pdu->add_dmrs_flag = 0;
+ }
+ else {
+ pucchfmt = pucch_Config->format3->choice.setup;
+ pucch_pdu->pi_2bpsk = pucchfmt->pi2BPSK!= NULL ? 1 : 0;
+ pucch_pdu->add_dmrs_flag = pucchfmt->additionalDMRS!= NULL ? 1 : 0;
+ }
+ break;
+ case NR_PUCCH_Resource__format_PR_format4 :
+ pucch_pdu->format_type = 4;
+ pucch_pdu->nr_of_symbols = pucchres->format.choice.format4->nrofSymbols;
+ pucch_pdu->start_symbol_index = pucchres->format.choice.format4->startingSymbolIndex;
+ pucch_pdu->pre_dft_occ_len = pucchres->format.choice.format4->occ_Length;
+ pucch_pdu->pre_dft_occ_idx = pucchres->format.choice.format4->occ_Index;
+ pucch_pdu->data_scrambling_id = pusch_id!= NULL ? *pusch_id : *scc->physCellId;
+ if (pucch_Config->format3 == NULL) {
+ pucch_pdu->pi_2bpsk = 0;
+ pucch_pdu->add_dmrs_flag = 0;
+ }
+ else {
+ pucchfmt = pucch_Config->format3->choice.setup;
+ pucch_pdu->pi_2bpsk = pucchfmt->pi2BPSK!= NULL ? 1 : 0;
+ pucch_pdu->add_dmrs_flag = pucchfmt->additionalDMRS!= NULL ? 1 : 0;
+ }
+ break;
+ default :
+ AssertFatal(1==0,"Undefined PUCCH format \n");
+ }
+ }
+ }
+
+ }
+ else { // this is for InitialBWP
+ AssertFatal(1==0,"Fill in InitialBWP PUCCH configuration\n");
+ }
+
+}
+
+
void fill_dci_pdu_rel15(nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
dci_pdu_rel15_t *dci_pdu_rel15,
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index 3c95d076c00..694473c16bd 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -103,6 +103,10 @@ int nr_is_dci_opportunity(nfapi_nr_search_space_t search_space,
uint16_t slot,
nfapi_nr_config_request_scf_t cfg);
*/
+void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
+ NR_PUCCH_ResourceId_t pucch_ResourceId,
+ NR_ServingCellConfigCommon_t *scc,
+ NR_BWP_Uplink_t *bwp);
void nr_configure_pdcch(nfapi_nr_dl_tti_pdcch_pdu_rel15_t* pdcch_pdu,
int ss_type,
NR_ServingCellConfigCommon_t *scc,
--
GitLab