From aed0cfe2af9d7926d4dad08693ff20164439a12b Mon Sep 17 00:00:00 2001 From: Daniel Andrade Date: Fri, 23 Jun 2023 14:31:43 +0100 Subject: [PATCH] Bugfix for getting band and numerology from command line for OAI UE --- executables/nr-uesoftmodem.c | 2 +- executables/softmodem-common.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c index 7896e57145..f2420641fd 100644 --- a/executables/nr-uesoftmodem.c +++ b/executables/nr-uesoftmodem.c @@ -513,7 +513,7 @@ int main( int argc, char **argv ) { NR_UE_MAC_INST_t *mac = get_mac_inst(0); if (get_softmodem_params()->sa) { // set frame config to initial values from command line and assume that the SSB is centered on the grid - uint16_t nr_band = get_band(downlink_frequency[CC_id][0],uplink_frequency_offset[CC_id][0]); + uint16_t nr_band = get_softmodem_params()->band; mac->nr_band = nr_band; nr_init_frame_parms_ue_sa(&UE[CC_id]->frame_parms, downlink_frequency[CC_id][0], diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h index 1f37c9bdea..9f792b158c 100644 --- a/executables/softmodem-common.h +++ b/executables/softmodem-common.h @@ -162,8 +162,8 @@ extern int usrp_tx_thread; {"d" , CONFIG_HLP_SOFTS, PARAMFLAG_BOOL, .uptr=&do_forms, .defintval=0, TYPE_UINT, 0}, \ {"dqt" , CONFIG_HLP_SOFTS_QT, PARAMFLAG_BOOL, .uptr=&do_forms_qt, .defintval=0, TYPE_UINT, 0}, \ {"q" , CONFIG_HLP_STMON, PARAMFLAG_BOOL, .iptr=&opp_enabled, .defintval=0, TYPE_INT, 0}, \ - {"numerology" , CONFIG_HLP_NUMEROLOGY, PARAMFLAG_BOOL, .iptr=&NUMEROLOGY, .defintval=1, TYPE_INT, 0}, \ - {"band" , CONFIG_HLP_BAND, PARAMFLAG_BOOL, .iptr=&BAND, .defintval=78, TYPE_INT, 0}, \ + {"numerology" , CONFIG_HLP_NUMEROLOGY, 0, .iptr=&NUMEROLOGY, .defintval=1, TYPE_INT, 0}, \ + {"band" , CONFIG_HLP_BAND, 0, .iptr=&BAND, .defintval=78, TYPE_INT, 0}, \ {"emulate-rf" , CONFIG_HLP_EMULATE_RF, PARAMFLAG_BOOL, .iptr=&EMULATE_RF, .defintval=0, TYPE_INT, 0}, \ {"parallel-config", CONFIG_HLP_PARALLEL_CMD, 0, .strptr=¶llel_config, .defstrval=NULL, TYPE_STRING, 0}, \ {"worker-config", CONFIG_HLP_WORKER_CMD, 0, .strptr=&worker_config, .defstrval=NULL, TYPE_STRING, 0}, \