diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c index 9cfbb1a17a..7a4cb5d340 100644 --- a/openair2/RRC/NR/rrc_gNB.c +++ b/openair2/RRC/NR/rrc_gNB.c @@ -176,24 +176,6 @@ void nr_rrc_transfer_protected_rrc_message(const gNB_RRC_INST *rrc, &data); } -static int get_dl_band(const f1ap_served_cell_info_t *cell_info) -{ - return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.freqinfo.band : cell_info->fdd.dl_freqinfo.band; -} - -static int get_ssb_scs(const f1ap_served_cell_info_t *cell_info) -{ - return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.tbw.scs : cell_info->fdd.dl_tbw.scs; -} - -static int get_ssb_arfcn(const nr_rrc_du_container_t *du) -{ - DevAssert(du != NULL && du->mtc != NULL); - /* format has been verified when accepting MeasurementTimingConfiguration */ - NR_MeasTimingList_t *mtlist = du->mtc->criticalExtensions.choice.c1->choice.measTimingConf->measTiming; - return mtlist->list.array[0]->frequencyAndTiming->carrierFreq; -} - ///---------------------------------------------------------------------------------------------------------------/// ///---------------------------------------------------------------------------------------------------------------/// diff --git a/openair2/RRC/NR/rrc_gNB_du.c b/openair2/RRC/NR/rrc_gNB_du.c index 3bce7964b0..92b37b48cc 100644 --- a/openair2/RRC/NR/rrc_gNB_du.c +++ b/openair2/RRC/NR/rrc_gNB_du.c @@ -28,6 +28,23 @@ #include "openair2/F1AP/f1ap_ids.h" #include "executables/softmodem-common.h" +int get_dl_band(const struct f1ap_served_cell_info_t *cell_info) +{ + return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.freqinfo.band : cell_info->fdd.dl_freqinfo.band; +} + +int get_ssb_scs(const struct f1ap_served_cell_info_t *cell_info) +{ + return cell_info->mode == F1AP_MODE_TDD ? cell_info->tdd.tbw.scs : cell_info->fdd.dl_tbw.scs; +} + +int get_ssb_arfcn(const struct nr_rrc_du_container_t *du) +{ + DevAssert(du != NULL && du->mtc != NULL); + /* format has been verified when accepting MeasurementTimingConfiguration */ + NR_MeasTimingList_t *mtlist = du->mtc->criticalExtensions.choice.c1->choice.measTimingConf->measTiming; + return mtlist->list.array[0]->frequencyAndTiming->carrierFreq; +} static int du_compare(const nr_rrc_du_container_t *a, const nr_rrc_du_container_t *b) { diff --git a/openair2/RRC/NR/rrc_gNB_du.h b/openair2/RRC/NR/rrc_gNB_du.h index 618450f774..35ec3aeb1b 100644 --- a/openair2/RRC/NR/rrc_gNB_du.h +++ b/openair2/RRC/NR/rrc_gNB_du.h @@ -42,4 +42,8 @@ struct nr_rrc_du_container_t *get_du_by_assoc_id(struct gNB_RRC_INST_s *rrc, sct void dump_du_info(const struct gNB_RRC_INST_s *rrc, FILE *f); +int get_dl_band(const struct f1ap_served_cell_info_t *cell_info); +int get_ssb_scs(const struct f1ap_served_cell_info_t *cell_info); +int get_ssb_arfcn(const struct nr_rrc_du_container_t *du); + #endif /* RRC_GNB_DU_H_ */