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

Change rrc_coreset_config() to return new coreset config

Browse Source
This commit is contained in:
Robert Schmidt
2023-04-11 10:07:07 +02:00
parent 2d1aa8425b
commit b9293754b8
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR/MESSAGES/asn1_msg.c
+1 -2
View File
@@ -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)); 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); 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, asn1cSeqAdd(&bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList->list,
coreset); coreset);
openair2/RRC/NR/nr_rrc_config.c
+6 -7
View File
@@ -111,11 +111,10 @@ NR_SearchSpace_t *rrc_searchspace_config(bool is_common,
return ss; return ss;
} }
void rrc_coreset_config(NR_ControlResourceSet_t *coreset, NR_ControlResourceSet_t *get_coreset_config(int bwp_id, int curr_bwp, uint64_t ssb_bitmap)
int bwp_id, {
int curr_bwp, NR_ControlResourceSet_t *coreset = calloc(1, sizeof(*coreset));
uint64_t ssb_bitmap) { AssertFatal(coreset != NULL, "out of memory\n");
// frequency domain resources depending on BWP size // frequency domain resources depending on BWP size
coreset->frequencyDomainResources.buf = calloc(1,6); coreset->frequencyDomainResources.buf = calloc(1,6);
coreset->frequencyDomainResources.buf[0] = (curr_bwp < 48) ? 0xf0 : 0xff; 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_StatesPDCCH_ToReleaseList = NULL;
coreset->tci_PresentInDCI = NULL; coreset->tci_PresentInDCI = NULL;
coreset->pdcch_DMRS_ScramblingID = NULL; coreset->pdcch_DMRS_ScramblingID = NULL;
return coreset;
} }
uint64_t get_ssb_bitmap(const NR_ServingCellConfigCommon_t *scc) { 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); 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); 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->commonControlResourceSet = coreset;
bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceZero=NULL; bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->searchSpaceZero=NULL;
openair2/RRC/NR/nr_rrc_config.h
+1 -4
View File
@@ -36,10 +36,7 @@
void set_phr_config(NR_MAC_CellGroupConfig_t *mac_CellGroupConfig); void set_phr_config(NR_MAC_CellGroupConfig_t *mac_CellGroupConfig);
uint64_t get_ssb_bitmap(const NR_ServingCellConfigCommon_t *scc); uint64_t get_ssb_bitmap(const NR_ServingCellConfigCommon_t *scc);
void rrc_coreset_config(NR_ControlResourceSet_t *coreset, NR_ControlResourceSet_t *get_coreset_config(int bwp_id, int curr_bwp, uint64_t ssb_bitmap);
int bwp_id,
int curr_bwp,
uint64_t ssb_bitmap);
NR_SearchSpace_t *rrc_searchspace_config(bool is_common, NR_SearchSpace_t *rrc_searchspace_config(bool is_common,
int searchspaceid, int searchspaceid,
int coresetid); int coresetid);