From ebdedfffcf3f5a455c8f6fcde63f735d207ead8a Mon Sep 17 00:00:00 2001 From: Bartosz Podrygajlo Date: Wed, 1 Jul 2026 11:56:20 +0200 Subject: [PATCH] feat(oru): load radio library according to configuration Signed-off-by: Bartosz Podrygajlo --- executables/main_nr_ru.c | 8 ++++---- radio/COMMON/common_lib.c | 13 ------------- radio/COMMON/common_lib.h | 1 - 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/executables/main_nr_ru.c b/executables/main_nr_ru.c index 3e16597751..5ff029f60e 100644 --- a/executables/main_nr_ru.c +++ b/executables/main_nr_ru.c @@ -215,11 +215,11 @@ int main(int argc, char **argv) oru.fronthaul = oru_fh_init(&oru.fh_config); AssertFatal(oru.fronthaul != NULL, "Cannot configure oru fronthaul, check your config file/cmdline"); - LOG_I(PHY, "starting vrtsim\n"); - ret = openair0_load(&ru->rfdevice, "vrtsim", &ru->openair0_cfg, NULL); - AssertFatal(ret == 0, "RU %u: openair0_load() ret %d: cannot initialize vrtsim\n", ru->idx, ret); + LOG_I(PHY, "starting rfdevice\n"); + ret = openair0_device_load(&ru->rfdevice, &ru->openair0_cfg); + AssertFatal(ret == 0, "RU %u: openair0_device_load() ret %d: cannot initialize rfdevice\n", ru->idx, ret); ret = ru->rfdevice.trx_start_func(&ru->rfdevice); - AssertFatal(ret == 0, "RU %u: trx_start_func() ret %d: cannot start vrtsim\n", ru->idx, ret); + AssertFatal(ret == 0, "RU %u: trx_start_func() ret %d: cannot start rfdevice\n", ru->idx, ret); threadCreate(&oru.north_read_thread, oru_north_read_thread, (void *)&oru, "north_read_thread", -1, OAI_PRIORITY_RT_MAX); threadCreate(&oru.south_read_thread, oru_south_read_thread, (void *)&oru, "south_read_thread", -1, OAI_PRIORITY_RT_MAX); diff --git a/radio/COMMON/common_lib.c b/radio/COMMON/common_lib.c index 0b4f1dfcd1..fc91d3f0a4 100644 --- a/radio/COMMON/common_lib.c +++ b/radio/COMMON/common_lib.c @@ -147,19 +147,6 @@ int openair0_transport_load(openair0_device_t *device, openair0_config_t *openai return rc; } -int openair0_load(openair0_device_t *device, char *name, openair0_config_t *openair0_cfg, eth_params_t *eth_params) -{ - loader_shlibfunc_t shlib_fdesc[1]; - int ret = 0; - - shlib_fdesc[0].fname = eth_params == NULL ? "device_init" : "transport_init"; - - ret = load_module_shlib(name, shlib_fdesc, 1, NULL); - AssertFatal((ret >= 0), "Library %s couldn't be loaded\n", name); - - return ((devfunc_t)shlib_fdesc[0].fptr)(device, openair0_cfg, eth_params); -} - static void writerEnqueue(re_order_t *ctx, openair0_timestamp_t timestamp, void **txp, int nsamps, int nbAnt, int flags) { pthread_mutex_lock(&ctx->mutex_store); diff --git a/radio/COMMON/common_lib.h b/radio/COMMON/common_lib.h index 47f015865a..cdd174e7d2 100644 --- a/radio/COMMON/common_lib.h +++ b/radio/COMMON/common_lib.h @@ -638,7 +638,6 @@ const char *get_devname(int devtype); int openair0_device_load(openair0_device_t *device, openair0_config_t *openair0_cfg); /*! \brief Initialize transport protocol . It returns 0 if OK */ int openair0_transport_load(openair0_device_t *device, openair0_config_t *openair0_cfg, eth_params_t *eth_params); -int openair0_load(openair0_device_t *device, char *name, openair0_config_t *openair0_cfg, eth_params_t *eth_params); /*! \brief Set RX frequencies * \param device the hardware to use