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

fixes

Browse Source
This commit is contained in:
francescomani
2022-11-24 15:23:41 +01:00
parent 1708092aec
commit 8303ddcf6f
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR/MESSAGES/asn1_msg.c
+6 -6
View File
@@ -1021,12 +1021,12 @@ void fill_initial_SpCellConfig(int uid,
bwp_id, bwp_id,
uid); uid);
} }
conig_rsrp_meas_report(csi_MeasConfig, config_rsrp_meas_report(csi_MeasConfig,
scc, scc,
pucchcsires1, pucchcsires1,
configuration->do_CSIRS, configuration->do_CSIRS,
bwp_id+10, bwp_id+10,
uid); uid);
} }
pdsch_servingcellconfig->codeBlockGroupTransmission = NULL; pdsch_servingcellconfig->codeBlockGroupTransmission = NULL;
pdsch_servingcellconfig->xOverhead = NULL; pdsch_servingcellconfig->xOverhead = NULL;
openair2/RRC/NR/nr_rrc_config.c
+10 -8
View File
@@ -283,7 +283,8 @@ void config_csiim(int do_csirs, int dl_antenna_ports, int curr_bwp,
NR_CSI_MeasConfig_t *csi_MeasConfig, int id) { NR_CSI_MeasConfig_t *csi_MeasConfig, int id) {
if (do_csirs && dl_antenna_ports > 1) { if (do_csirs && dl_antenna_ports > 1) {
csi_MeasConfig->csi_IM_ResourceToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceToAddModList)); if(!csi_MeasConfig->csi_IM_ResourceToAddModList)
csi_MeasConfig->csi_IM_ResourceToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceToAddModList));
NR_CSI_IM_Resource_t *imres = calloc(1,sizeof(*imres)); NR_CSI_IM_Resource_t *imres = calloc(1,sizeof(*imres));
imres->csi_IM_ResourceId = id; imres->csi_IM_ResourceId = id;
NR_NZP_CSI_RS_Resource_t *nzpcsi = NULL; NR_NZP_CSI_RS_Resource_t *nzpcsi = NULL;
@@ -309,7 +310,8 @@ void config_csiim(int do_csirs, int dl_antenna_ports, int curr_bwp,
imres->periodicityAndOffset->present = nzpcsi->periodicityAndOffset->present; imres->periodicityAndOffset->present = nzpcsi->periodicityAndOffset->present;
set_csiim_offset(imres->periodicityAndOffset, nzpcsi->periodicityAndOffset); set_csiim_offset(imres->periodicityAndOffset, nzpcsi->periodicityAndOffset);
ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_IM_ResourceToAddModList->list,imres); ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_IM_ResourceToAddModList->list,imres);
csi_MeasConfig->csi_IM_ResourceSetToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceSetToAddModList)); if(!csi_MeasConfig->csi_IM_ResourceSetToAddModList)
csi_MeasConfig->csi_IM_ResourceSetToAddModList = calloc(1,sizeof(*csi_MeasConfig->csi_IM_ResourceSetToAddModList));
NR_CSI_IM_ResourceSet_t *imset = calloc(1,sizeof(*imset)); NR_CSI_IM_ResourceSet_t *imset = calloc(1,sizeof(*imset));
imset->csi_IM_ResourceSetId = id; imset->csi_IM_ResourceSetId = id;
NR_CSI_IM_ResourceId_t *res = calloc(1,sizeof(*res)); NR_CSI_IM_ResourceId_t *res = calloc(1,sizeof(*res));
@@ -1450,12 +1452,12 @@ void config_csi_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ReportConfigToAddModList->list,csirep); ASN_SEQUENCE_ADD(&csi_MeasConfig->csi_ReportConfigToAddModList->list,csirep);
} }
void conig_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, void config_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
const NR_ServingCellConfigCommon_t *servingcellconfigcommon, const NR_ServingCellConfigCommon_t *servingcellconfigcommon,
NR_PUCCH_CSI_Resource_t *pucchcsires, NR_PUCCH_CSI_Resource_t *pucchcsires,
int do_csi, // if rsrp is based on CSI or SSB int do_csi, // if rsrp is based on CSI or SSB
int rep_id, int rep_id,
int uid) int uid)
{ {
NR_CSI_ReportConfig_t *csirep = calloc(1,sizeof(*csirep)); NR_CSI_ReportConfig_t *csirep = calloc(1,sizeof(*csirep));
openair2/RRC/NR/nr_rrc_config.h
+6 -6
View File
@@ -58,12 +58,12 @@ void set_dl_DataToUL_ACK(NR_PUCCH_Config_t *pucch_Config, int min_feedback_time)
void set_pucch_power_config(NR_PUCCH_Config_t *pucch_Config, int do_csirs); void set_pucch_power_config(NR_PUCCH_Config_t *pucch_Config, int do_csirs);
void scheduling_request_config(const NR_ServingCellConfigCommon_t *scc, void scheduling_request_config(const NR_ServingCellConfigCommon_t *scc,
NR_PUCCH_Config_t *pucch_Config); NR_PUCCH_Config_t *pucch_Config);
void conig_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, void config_rsrp_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
const NR_ServingCellConfigCommon_t *servingcellconfigcommon, const NR_ServingCellConfigCommon_t *servingcellconfigcommon,
NR_PUCCH_CSI_Resource_t *pucchcsires, NR_PUCCH_CSI_Resource_t *pucchcsires,
int do_csi, int do_csi,
int rep_id, int rep_id,
int uid); int uid);
void config_csi_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig, void config_csi_meas_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
const NR_ServingCellConfigCommon_t *servingcellconfigcommon, const NR_ServingCellConfigCommon_t *servingcellconfigcommon,
NR_PUCCH_CSI_Resource_t *pucchcsires, NR_PUCCH_CSI_Resource_t *pucchcsires,
openair2/RRC/NR/rrc_gNB_reconfig.c
+6 -6
View File
@@ -419,12 +419,12 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
NR_MAX_SUPPORTED_DL_LAYERS, NR_MAX_SUPPORTED_DL_LAYERS,
bwp->bwp_Id, bwp->bwp_Id,
uid); uid);
conig_rsrp_meas_report(csi_MeasConfig, config_rsrp_meas_report(csi_MeasConfig,
servingcellconfigcommon, servingcellconfigcommon,
pucchcsires1, pucchcsires1,
do_csirs, do_csirs,
bwp->bwp_Id+10, bwp->bwp_Id+10,
uid); uid);
} }
secondaryCellGroup->spCellConfig->spCellConfigDedicated->sCellDeactivationTimer=NULL; secondaryCellGroup->spCellConfig->spCellConfigDedicated->sCellDeactivationTimer=NULL;