Skip to content

O
OpenXG-RAN
Commit d66aea3f authored by Francesco Mani's avatar Francesco Mani
Browse files
Options

bugfixes in dci size

parent 0f951992
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @ d66aea3f
...@@ -1979,8 +1979,10 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc, ...@@ -1979,8 +1979,10 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc,
if (srs_config->srs_ResourceSetToAddModList->list.array[i]->usage == NR_SRS_ResourceSet__usage_codebook) if (srs_config->srs_ResourceSetToAddModList->list.array[i]->usage == NR_SRS_ResourceSet__usage_codebook)
count++; count++;
} }
if (count>1) if (count>1) {
dci_pdu->srs_resource_indicator.nbits = 1; dci_pdu->srs_resource_indicator.nbits = 1;
size += dci_pdu->srs_resource_indicator.nbits;
}
} }
else { else {
int lmin,Lmax = 0; int lmin,Lmax = 0;
...@@ -2003,11 +2005,12 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc, ...@@ -2003,11 +2005,12 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc,
} }
} }
dci_pdu->srs_resource_indicator.nbits = (int)ceil(log2(lsum)); dci_pdu->srs_resource_indicator.nbits = (int)ceil(log2(lsum));
size += dci_pdu->srs_resource_indicator.nbits;
} }
} }
size += dci_pdu->srs_resource_indicator.nbits;
// Precoding info and number of layers // Precoding info and number of layers
long transformPrecoder; long transformPrecoder;
dci_pdu->precoding_information.nbits = 0;
if (pusch_Config->transformPrecoder == NULL){ if (pusch_Config->transformPrecoder == NULL){
// if transform precoder is null, apply the values from msg3 // if transform precoder is null, apply the values from msg3
if(scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg3_transformPrecoder == NULL) if(scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->msg3_transformPrecoder == NULL)
......
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