maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

additional parameters in pucch structure to avoid double computation

Browse Source
This commit is contained in:
francescomani
2021-12-16 14:44:40 +01:00
parent f2f6850b33
commit 2414a681f8
2 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+18 -39
View File
@@ -1196,35 +1196,34 @@ bool test_acknack_vrb_occupation(NR_UE_sched_ctrl_t *sched_ctrl,
(csi_pucch->csi_bits + csi_pucch->dai_c) < 11) (csi_pucch->csi_bits + csi_pucch->dai_c) < 11)
return true; // available resources for csi_pucch already verified return true; // available resources for csi_pucch already verified
int prb_start, second_hop_prb, nr_of_symb, start_symb;
if(r_pucch<0){ if(r_pucch<0){
const NR_PUCCH_Resource_t *resource = pucch_Config->resourceToAddModList->list.array[0]; const NR_PUCCH_Resource_t *resource = pucch_Config->resourceToAddModList->list.array[0];
DevAssert(resource->format.present == NR_PUCCH_Resource__format_PR_format0); DevAssert(resource->format.present == NR_PUCCH_Resource__format_PR_format0);
second_hop_prb = resource->secondHopPRB!= NULL ? *resource->secondHopPRB : 0; pucch->second_hop_prb = resource->secondHopPRB!= NULL ? *resource->secondHopPRB : 0;
nr_of_symb = resource->format.choice.format0->nrofSymbols; pucch->nr_of_symb = resource->format.choice.format0->nrofSymbols;
start_symb = resource->format.choice.format0->startingSymbolIndex; pucch->start_symb = resource->format.choice.format0->startingSymbolIndex;
prb_start = resource->startingPRB; pucch->prb_start = resource->startingPRB;
} }
else{ else{
int rsetindex = *scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->pucch_ResourceCommon; int rsetindex = *scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->pucch_ResourceCommon;
set_r_pucch_parms(rsetindex, set_r_pucch_parms(rsetindex,
r_pucch, r_pucch,
bwp_size, bwp_size,
&prb_start, &pucch->prb_start,
&second_hop_prb, &pucch->second_hop_prb,
&nr_of_symb, &pucch->nr_of_symb,
&start_symb); &pucch->start_symb);
} }
// verifying occupation of PRBs for ACK/NACK on dedicated pucch // verifying occupation of PRBs for ACK/NACK on dedicated pucch
bool ret = true; bool ret = true;
for (int l=0; l<nr_of_symb; l++) { for (int l=0; l<pucch->nr_of_symb; l++) {
uint16_t symb = SL_to_bitmap(start_symb+l, 1); uint16_t symb = SL_to_bitmap(pucch->start_symb+l, 1);
int prb; int prb;
if (l==1 && second_hop_prb != 0) if (l==1 && pucch->second_hop_prb != 0)
prb = second_hop_prb; prb = pucch->second_hop_prb;
else else
prb = prb_start; prb = pucch->prb_start;
if ((vrb_map_UL[bwp_start+prb] & symb) != 0) { if ((vrb_map_UL[bwp_start+prb] & symb) != 0) {
ret = false; ret = false;
break; break;
@@ -1489,34 +1488,14 @@ int nr_acknack_scheduling(int mod_id,
pucch->resource_indicator = 0; // each UE has dedicated PUCCH resources pucch->resource_indicator = 0; // each UE has dedicated PUCCH resources
pucch->r_pucch=r_pucch; pucch->r_pucch=r_pucch;
int prb_start, second_hop_prb, nr_of_symb, start_symb;
if(r_pucch<0){
const NR_PUCCH_Resource_t *resource = pucch_Config->resourceToAddModList->list.array[pucch->resource_indicator];
DevAssert(resource->format.present == NR_PUCCH_Resource__format_PR_format0);
second_hop_prb = resource->secondHopPRB!= NULL ? *resource->secondHopPRB : 0;
nr_of_symb = resource->format.choice.format0->nrofSymbols;
start_symb = resource->format.choice.format0->startingSymbolIndex;
prb_start = resource->startingPRB;
}
else{
int rsetindex = *scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->pucch_ResourceCommon;
set_r_pucch_parms(rsetindex,
r_pucch,
bwp_size,
&prb_start,
&second_hop_prb,
&nr_of_symb,
&start_symb);
}
uint16_t *vrb_map_UL = &RC.nrmac[mod_id]->common_channels[CC_id].vrb_map_UL[pucch->ul_slot * MAX_BWP_SIZE]; uint16_t *vrb_map_UL = &RC.nrmac[mod_id]->common_channels[CC_id].vrb_map_UL[pucch->ul_slot * MAX_BWP_SIZE];
for (int l=0; l<nr_of_symb; l++) { for (int l=0; l<pucch->nr_of_symb; l++) {
uint16_t symb = SL_to_bitmap(start_symb+l, 1); uint16_t symb = SL_to_bitmap(pucch->start_symb+l, 1);
int prb; int prb;
if (l==1 && second_hop_prb != 0) if (l==1 && pucch->second_hop_prb != 0)
prb = second_hop_prb; prb = pucch->second_hop_prb;
else else
prb = prb_start; prb = pucch->prb_start;
vrb_map_UL[bwp_start+prb] |= symb; vrb_map_UL[bwp_start+prb] |= symb;
} }
return 0; return 0;
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+4
View File
@@ -313,6 +313,10 @@ typedef struct NR_sched_pucch {
uint8_t timing_indicator; uint8_t timing_indicator;
uint8_t resource_indicator; uint8_t resource_indicator;
int r_pucch; int r_pucch;
int prb_start;
int second_hop_prb;
int nr_of_symb;
int start_symb;
} NR_sched_pucch_t; } NR_sched_pucch_t;
/* PUSCH semi-static configuration: as long as the TDA and DCI format remain /* PUSCH semi-static configuration: as long as the TDA and DCI format remain