Commit c949170a authored by Francesco Mani's avatar Francesco Mani
Browse files

calloc for dci_pdu in ul

parent 9bd13924
...@@ -1960,8 +1960,6 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc, ...@@ -1960,8 +1960,6 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc,
dci_pdu->frequency_hopping_flag.nbits = 1; dci_pdu->frequency_hopping_flag.nbits = 1;
size += 1; size += 1;
} }
else
dci_pdu->frequency_hopping_flag.nbits = 0;
// 1st DAI // 1st DAI
if (secondaryCellGroup->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook==NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic) if (secondaryCellGroup->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook==NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic)
dci_pdu->dai[0].nbits = 2; dci_pdu->dai[0].nbits = 2;
...@@ -2012,7 +2010,6 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc, ...@@ -2012,7 +2010,6 @@ uint16_t nr_dci_size(NR_ServingCellConfigCommon_t *scc,
} }
// 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)
......
...@@ -1065,9 +1065,10 @@ void schedule_fapi_ul_pdu(int Mod_idP, ...@@ -1065,9 +1065,10 @@ void schedule_fapi_ul_pdu(int Mod_idP,
return; return;
} }
else { else {
dci_pdu_rel15_t dci_pdu_rel15[MAX_DCI_CORESET]; dci_pdu_rel15_t *dci_pdu_rel15 = calloc(MAX_DCI_CORESET,sizeof(dci_pdu_rel15_t));
config_uldci(ubwp,pusch_pdu,pdcch_pdu_rel15,&dci_pdu_rel15[0],dci_formats,rnti_types,time_domain_assignment,n_ubwp,bwp_id); config_uldci(ubwp,pusch_pdu,pdcch_pdu_rel15,&dci_pdu_rel15[0],dci_formats,rnti_types,time_domain_assignment,n_ubwp,bwp_id);
fill_dci_pdu_rel15(scc,secondaryCellGroup,pdcch_pdu_rel15,dci_pdu_rel15,dci_formats,rnti_types,pusch_pdu->bwp_size,bwp_id); fill_dci_pdu_rel15(scc,secondaryCellGroup,pdcch_pdu_rel15,dci_pdu_rel15,dci_formats,rnti_types,pusch_pdu->bwp_size,bwp_id);
free(dci_pdu_rel15);
} }
} }
} }
......
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