From 0219e4d3c738f23509336e4d7d2d1c6350e2e46f Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Thu, 12 Feb 2026 10:09:01 +0100 Subject: [PATCH] Remove band number from openair0_config_t --- executables/nr-ru.c | 5 ++--- radio/COMMON/common_lib.h | 2 -- radio/fhi_72/oran-config.c | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/executables/nr-ru.c b/executables/nr-ru.c index 397f940745..b2c3c98741 100644 --- a/executables/nr-ru.c +++ b/executables/nr-ru.c @@ -1747,13 +1747,12 @@ static void NRRCconfig_RU(configmodule_interface_t *cfg) for (int i = 0; i < ru->num_bands; i++) ru->band[i] = param[RU_BAND_LIST_IDX].iptr[i]; ru->openair0_cfg.nr_flag = *param[RU_NR_FLAG].iptr; - ru->openair0_cfg.nr_band = ru->band[0]; + // TODO remove band from RU? ru->openair0_cfg.nr_scs_for_raster = *param[RU_NR_SCS_FOR_RASTER].iptr; LOG_D(PHY, - "[RU %d] Setting nr_flag %d, nr_band %d, nr_scs_for_raster %d\n", + "[RU %d] Setting nr_flag %d, nr_scs_for_raster %d\n", j, ru->openair0_cfg.nr_flag, - ru->openair0_cfg.nr_band, ru->openair0_cfg.nr_scs_for_raster); ru->openair0_cfg.rxfh_cores[0] = *param[RU_RXFH_CORE_ID].iptr; ru->openair0_cfg.txfh_cores[0] = *param[RU_TXFH_CORE_ID].iptr; diff --git a/radio/COMMON/common_lib.h b/radio/COMMON/common_lib.h index f21a1ffff4..db15a3967d 100644 --- a/radio/COMMON/common_lib.h +++ b/radio/COMMON/common_lib.h @@ -275,8 +275,6 @@ typedef struct openair0_config { recplay_conf_t *recplay_conf; //! Flag to indicate this configuration is for NR int nr_flag; - //! NR band number - int nr_band; //! NR scs for raster int nr_scs_for_raster; //! Core IDs for RX FH diff --git a/radio/fhi_72/oran-config.c b/radio/fhi_72/oran-config.c index 6f8afc092f..0fac6452e6 100644 --- a/radio/fhi_72/oran-config.c +++ b/radio/fhi_72/oran-config.c @@ -902,7 +902,6 @@ static bool set_fh_config(void *mplane_api, int ru_idx, int num_rus, enum xran_c DevAssert(oai0->rx_freq[0] > 0); for (int i = 1; i < oai0->rx_num_channels; ++i) DevAssert(oai0->rx_freq[0] == oai0->rx_freq[i]); - DevAssert(oai0->nr_band > 0); paramdef_t FHconfigs[] = ORAN_FH_DESC; paramlist_def_t FH_ConfigList = {CONFIG_STRING_ORAN_FH}; char aprefix[MAX_OPTNAME_SIZE] = {0};