diff --git a/CommonLibs/debug.c b/CommonLibs/debug.c index cc5be44d..c227435e 100644 --- a/CommonLibs/debug.c +++ b/CommonLibs/debug.c @@ -65,9 +65,9 @@ static const struct log_info_cat default_categories[] = { .color = NULL, .enabled = 1, .loglevel = LOGL_INFO, }, - [DLMS] = { - .name = "DLMS", - .description = "Logging from within LimeSuite itself", + [DDEVDRV] = { + .name = "DDEVDRV", + .description = "Logging from external device driver library implementing lower level specifics", .color = NULL, .enabled = 1, .loglevel = LOGL_NOTICE, }, diff --git a/CommonLibs/debug.h b/CommonLibs/debug.h index 38373293..0dca2eea 100644 --- a/CommonLibs/debug.h +++ b/CommonLibs/debug.h @@ -15,7 +15,7 @@ enum { DTRXDDL, DTRXDUL, DDEV, - DLMS, + DDEVDRV, }; #define CLOGC(category, level, fmt, args...) do { \ diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index 02d6572b..44e1d310 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -32,6 +32,7 @@ #include #include +#include #include #include @@ -731,5 +732,7 @@ int trx_vty_init(struct trx_ctx* trx) install_element(CHAN_NODE, &cfg_chan_rx_path_cmd); install_element(CHAN_NODE, &cfg_chan_tx_path_cmd); + logging_vty_add_deprecated_subsys(g_trx_ctx, "lms"); + return 0; } diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index b5993b8d..19fe6e85 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -93,7 +93,7 @@ static void lms_log_callback(int lvl, const char *msg) if ((unsigned int) lvl >= ARRAY_SIZE(lvl_map)) lvl = ARRAY_SIZE(lvl_map)-1; - LOGLV(DLMS, lvl_map[lvl]) << msg; + LOGLV(DDEVDRV, lvl_map[lvl]) << msg; } static void print_range(const char* name, lms_range_t *range) diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 16047a93..0ad60ef0 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -588,10 +588,10 @@ int main(int argc, char *argv[]) log_enable_multithread(); osmo_stats_init(tall_trx_ctx); vty_init(&g_vty_info); + logging_vty_add_cmds(); ctrl_vty_init(tall_trx_ctx); trx_vty_init(g_trx_ctx); - logging_vty_add_cmds(); osmo_talloc_vty_add_cmds(); osmo_stats_vty_add_cmds();