From b9293754b89396db1e516b72ac7358d9d06ff466 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 22 Mar 2023 08:34:37 +0100 Subject: [PATCH] Change rrc_coreset_config() to return new coreset config --- openair2/RRC/NR/MESSAGES/asn1_msg.c | 3 +-- openair2/RRC/NR/nr_rrc_config.c | 13 ++++++------- openair2/RRC/NR/nr_rrc_config.h | 5 +---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c index ce888e9814..16a027fb50 100644 --- a/openair2/RRC/NR/MESSAGES/asn1_msg.c +++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c @@ -749,10 +749,9 @@ void fill_initial_SpCellConfig(int uid, bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList = calloc(1,sizeof(*bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList)); - NR_ControlResourceSet_t *coreset = calloc(1,sizeof(*coreset)); uint64_t bitmap = get_ssb_bitmap(scc); - rrc_coreset_config(coreset, 0, curr_bwp, bitmap); + NR_ControlResourceSet_t *coreset = get_coreset_config(0, curr_bwp, bitmap); asn1cSeqAdd(&bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list, coreset); diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c index 3e506b964c..2b989659b6 100644 --- a/openair2/RRC/NR/nr_rrc_config.c +++ b/openair2/RRC/NR/nr_rrc_config.c @@ -111,11 +111,10 @@ NR_SearchSpace_t *rrc_searchspace_config(bool is_common, return ss; } -void rrc_coreset_config(NR_ControlResourceSet_t *coreset, - int bwp_id, - int curr_bwp, - uint64_t ssb_bitmap) { - +NR_ControlResourceSet_t *get_coreset_config(int bwp_id, int curr_bwp, uint64_t ssb_bitmap) +{ + NR_ControlResourceSet_t *coreset = calloc(1, sizeof(*coreset)); + AssertFatal(coreset != NULL, "out of memory\n"); // frequency domain resources depending on BWP size coreset->frequencyDomainResources.buf = calloc(1,6); coreset->frequencyDomainResources.buf[0] = (curr_bwp < 48) ? 0xf0 : 0xff; @@ -145,6 +144,7 @@ void rrc_coreset_config(NR_ControlResourceSet_t *coreset, coreset->tci_StatesPDCCH_ToReleaseList = NULL; coreset->tci_PresentInDCI = NULL; coreset->pdcch_DMRS_ScramblingID = NULL; + return coreset; } uint64_t get_ssb_bitmap(const NR_ServingCellConfigCommon_t *scc) { @@ -1178,9 +1178,8 @@ void config_downlinkBWP(NR_BWP_Downlink_t *bwp, int curr_bwp = NRRIV2BW(bwp->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE); - NR_ControlResourceSet_t *coreset = calloc(1,sizeof(*coreset)); uint64_t ssb_bitmap = get_ssb_bitmap(scc); - rrc_coreset_config(coreset, bwp->bwp_Id, curr_bwp, ssb_bitmap); + NR_ControlResourceSet_t *coreset = get_coreset_config(bwp->bwp_Id, curr_bwp, ssb_bitmap); bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonControlResourceSet = coreset; bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceZero=NULL; diff --git a/openair2/RRC/NR/nr_rrc_config.h b/openair2/RRC/NR/nr_rrc_config.h index b64f953814..6d10823555 100644 --- a/openair2/RRC/NR/nr_rrc_config.h +++ b/openair2/RRC/NR/nr_rrc_config.h @@ -36,10 +36,7 @@ void set_phr_config(NR_MAC_CellGroupConfig_t *mac_CellGroupConfig); uint64_t get_ssb_bitmap(const NR_ServingCellConfigCommon_t *scc); -void rrc_coreset_config(NR_ControlResourceSet_t *coreset, - int bwp_id, - int curr_bwp, - uint64_t ssb_bitmap); +NR_ControlResourceSet_t *get_coreset_config(int bwp_id, int curr_bwp, uint64_t ssb_bitmap); NR_SearchSpace_t *rrc_searchspace_config(bool is_common, int searchspaceid, int coresetid);