Skip to content

O
OpenXG-RAN
Commit a76ef07a authored by Xue Song's avatar Xue Song
Browse files
Options

Merge branch 'develop_SA_RRC' into develop_SA_SIM

parents 46bbb6a9 43ef53cb
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @ a76ef07a
...@@ -624,7 +624,11 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu, ...@@ -624,7 +624,11 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
AssertFatal(1==0,"Couldn't fine pucch resource indicator %d in PUCCH resource set %d for %d UCI bits",pucch_resource,i,O_uci); AssertFatal(1==0,"Couldn't fine pucch resource indicator %d in PUCCH resource set %d for %d UCI bits",pucch_resource,i,O_uci);
} }
else { else {
#if (NR_RRC_VERSION >= MAKE_VERSION(16, 0, 0))
N3 = pucchresset->maxPayloadSize!= NULL ? *pucchresset->maxPayloadSize : 1706; N3 = pucchresset->maxPayloadSize!= NULL ? *pucchresset->maxPayloadSize : 1706;
#else
N3 = pucchresset->maxPayloadMinus1!= NULL ? *pucchresset->maxPayloadMinus1 : 1706;
#endif
if (N2<O_uci && N3>O_uci) { if (N2<O_uci && N3>O_uci) {
if (pucch_resource < n_list) if (pucch_resource < n_list)
resource_id = pucchresset->resourceList.list.array[pucch_resource]; resource_id = pucchresset->resourceList.list.array[pucch_resource];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment