From 54f49fd25344ea43177a2f3afdbe2f3997ba4fa9 Mon Sep 17 00:00:00 2001
From: luis_pereira87 <lpereira@allbesmart.pt>
Date: Thu, 12 May 2022 17:33:35 +0100
Subject: [PATCH] Remove duplicated code for bwp common validation
---
openair2/LAYER2/NR_MAC_UE/config_ue.c | 11 +----
openair2/LAYER2/NR_MAC_UE/mac_proto.h | 2 +
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c | 43 ++++++++++++--------
3 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c
index cc287872f1d..b0d41f317bf 100644
--- a/openair2/LAYER2/NR_MAC_UE/config_ue.c
+++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c
@@ -508,16 +508,7 @@ void configure_ss_coreset(NR_UE_MAC_INST_t *mac,
NR_ServingCellConfig_t *scd,
NR_BWP_Id_t dl_bwp_id) {
-
- NR_BWP_DownlinkCommon_t *bwp_Common = NULL;
- if(dl_bwp_id > 0 && scd->downlinkBWP_ToAddModList) {
- bwp_Common = scd->downlinkBWP_ToAddModList->list.array[dl_bwp_id - 1]->bwp_Common;
- } else if(mac->scc) {
- bwp_Common = mac->scc->downlinkConfigCommon->initialDownlinkBWP;
- } else if(mac->scc_SIB) {
- bwp_Common = &mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP;
- }
-
+ NR_BWP_DownlinkCommon_t *bwp_Common = get_bwp_downlink_common(mac, dl_bwp_id);
AssertFatal(bwp_Common != NULL, "bwp_Common is null\n");
NR_SetupRelease_PDCCH_ConfigCommon_t *pdcch_ConfigCommon = bwp_Common->pdcch_ConfigCommon;
diff --git a/openair2/LAYER2/NR_MAC_UE/mac_proto.h b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
index 86d72becef4..ccd8ed83053 100644
--- a/openair2/LAYER2/NR_MAC_UE/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_UE/mac_proto.h
@@ -260,6 +260,8 @@ void get_bwp_info(NR_UE_MAC_INST_t *mac,
NR_BWP_UplinkDedicated_t **ubwpd,
NR_BWP_UplinkCommon_t **ubwpc);
+NR_BWP_DownlinkCommon_t *get_bwp_downlink_common(NR_UE_MAC_INST_t *mac, NR_BWP_Id_t dl_bwp_id);
+
uint8_t nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
uint8_t dci_format,
uint8_t dci_length,
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index ccb90aa22f3..dca9e1db566 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -191,24 +191,19 @@ void get_bwp_info(NR_UE_MAC_INST_t *mac,
NR_BWP_UplinkDedicated_t **ubwpd,
NR_BWP_UplinkCommon_t **ubwpc) {
- if (dl_bwp_id > 0) {
- AssertFatal(mac->DLbwp[dl_bwp_id-1]!=NULL,"mac->DLbwp[%d] is null, shouldn't be\n",
- (int)dl_bwp_id-1);
- *bwpd = mac->DLbwp[dl_bwp_id-1]->bwp_Dedicated;
- if (mac->DLbwp[dl_bwp_id-1]->bwp_Common) *bwpc = mac->DLbwp[dl_bwp_id-1]->bwp_Common;
- else if (mac->scc) *bwpc = mac->scc->downlinkConfigCommon->initialDownlinkBWP;
- else if (mac->scc_SIB) *bwpc = &mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP;
- AssertFatal(*bwpc!=NULL,"bwpc shouldn't be null\n");
- } else {
- if (mac->cg &&
- mac->cg->spCellConfig &&
- mac->cg->spCellConfig->spCellConfigDedicated &&
- mac->cg->spCellConfig->spCellConfigDedicated->initialDownlinkBWP)
- *bwpd = mac->cg->spCellConfig->spCellConfigDedicated->initialDownlinkBWP;
- if (mac->scc) *bwpc = mac->scc->downlinkConfigCommon->initialDownlinkBWP;
- else if (mac->scc_SIB) *bwpc = &mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP;
- AssertFatal(*bwpc!=NULL,"bwpc shouldn't be null\n");
- }
+ if (dl_bwp_id > 0) {
+ AssertFatal(mac->DLbwp[dl_bwp_id-1]!=NULL,"mac->DLbwp[%d] is null, shouldn't be\n", (int)dl_bwp_id-1);
+ *bwpd = mac->DLbwp[dl_bwp_id-1]->bwp_Dedicated;
+ } else {
+ if (mac->cg &&
+ mac->cg->spCellConfig &&
+ mac->cg->spCellConfig->spCellConfigDedicated &&
+ mac->cg->spCellConfig->spCellConfigDedicated->initialDownlinkBWP)
+ *bwpd = mac->cg->spCellConfig->spCellConfigDedicated->initialDownlinkBWP;
+ }
+
+ *bwpc = get_bwp_downlink_common(mac, dl_bwp_id);
+ AssertFatal(*bwpc!=NULL,"bwpc shouldn't be null\n");
if (ul_bwp_id > 0) {
AssertFatal(mac->ULbwp[ul_bwp_id-1]!=NULL,"mac->ULbwp[%d] is null, shouldn't be\n",
@@ -233,6 +228,18 @@ void get_bwp_info(NR_UE_MAC_INST_t *mac,
}
}
+NR_BWP_DownlinkCommon_t *get_bwp_downlink_common(NR_UE_MAC_INST_t *mac, NR_BWP_Id_t dl_bwp_id) {
+ NR_BWP_DownlinkCommon_t *bwp_Common = NULL;
+ if (dl_bwp_id > 0 && mac->cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList) {
+ bwp_Common = mac->cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[dl_bwp_id-1]->bwp_Common;
+ } else if (mac->scc) {
+ bwp_Common = mac->scc->downlinkConfigCommon->initialDownlinkBWP;
+ } else if (mac->scc_SIB) {
+ bwp_Common = &mac->scc_SIB->downlinkConfigCommon.initialDownlinkBWP;
+ }
+ return bwp_Common;
+}
+
NR_PDSCH_TimeDomainResourceAllocationList_t *choose_dl_tda_list(NR_PDSCH_Config_t *pdsch_Config,NR_PDSCH_ConfigCommon_t *pdsch_ConfigCommon) {
NR_PDSCH_TimeDomainResourceAllocationList_t *pdsch_TimeDomainAllocationList=NULL;
--
GitLab