Commit d791d03e authored by francescomani's avatar francescomani

fix to have correct maxMIMO_layers in dlsim computing tbslbrm

parent 0053a3d0
...@@ -658,6 +658,7 @@ int main(int argc, char **argv) ...@@ -658,6 +658,7 @@ int main(int argc, char **argv)
.minRXTXTIME = 6, .minRXTXTIME = 6,
.do_CSIRS = 0, .do_CSIRS = 0,
.do_SRS = 0, .do_SRS = 0,
.maxMIMO_layers = g_nrOfLayers,
.force_256qam_off = false, .force_256qam_off = false,
.timer_config.sr_ProhibitTimer = 0, .timer_config.sr_ProhibitTimer = 0,
.timer_config.sr_TransMax = 64, .timer_config.sr_TransMax = 64,
......
...@@ -566,9 +566,8 @@ static void config_csiim(int do_csirs, ...@@ -566,9 +566,8 @@ static void config_csiim(int do_csirs,
void set_dl_maxmimolayers(NR_PDSCH_ServingCellConfig_t *pdsch_servingcellconfig, void set_dl_maxmimolayers(NR_PDSCH_ServingCellConfig_t *pdsch_servingcellconfig,
const NR_ServingCellConfigCommon_t *scc, const NR_ServingCellConfigCommon_t *scc,
const NR_UE_NR_Capability_t *uecap, const NR_UE_NR_Capability_t *uecap,
int maxMIMO_layers) int maxMIMO_layers)
{ {
if(!pdsch_servingcellconfig->ext1) if(!pdsch_servingcellconfig->ext1)
pdsch_servingcellconfig->ext1=calloc(1,sizeof(*pdsch_servingcellconfig->ext1)); pdsch_servingcellconfig->ext1=calloc(1,sizeof(*pdsch_servingcellconfig->ext1));
if(!pdsch_servingcellconfig->ext1->maxMIMO_Layers) if(!pdsch_servingcellconfig->ext1->maxMIMO_Layers)
...@@ -871,6 +870,8 @@ void prepare_sim_uecap(NR_UE_NR_Capability_t *cap, ...@@ -871,6 +870,8 @@ void prepare_sim_uecap(NR_UE_NR_Capability_t *cap,
fs_cc->supportedBandwidthDL.present = NR_SupportedBandwidth_PR_fr1; fs_cc->supportedBandwidthDL.present = NR_SupportedBandwidth_PR_fr1;
fs_cc->supportedBandwidthDL.choice.fr1 = bw; fs_cc->supportedBandwidthDL.choice.fr1 = bw;
} }
fs_cc->maxNumberMIMO_LayersPDSCH = calloc(1, sizeof(*fs_cc->maxNumberMIMO_LayersPDSCH));
*fs_cc->maxNumberMIMO_LayersPDSCH = NR_MIMO_LayersDL_fourLayers;
fs_cc->supportedModulationOrderDL = calloc(1, sizeof(*fs_cc->supportedModulationOrderDL)); fs_cc->supportedModulationOrderDL = calloc(1, sizeof(*fs_cc->supportedModulationOrderDL));
*fs_cc->supportedModulationOrderDL = NR_ModulationOrder_qam256; *fs_cc->supportedModulationOrderDL = NR_ModulationOrder_qam256;
asn1cSeqAdd(&fs->featureSetsDownlinkPerCC->list, fs_cc); asn1cSeqAdd(&fs->featureSetsDownlinkPerCC->list, fs_cc);
......
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