This is an automated email from the ASF dual-hosted git repository. jerzy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 9483fe2f7e2a5912254ac0f195cb1134bd018147 Author: Jerzy Kasenberg <[email protected]> AuthorDate: Wed Apr 3 11:17:55 2024 +0200 sys/log: Use autogenerated function to get mod log name Current code had switch in function log_module_get_name() that returned module name based on some syscfg value first then it search modules registered by log_module_register(). Some of the syscfg values used in this code were referring to be values that are not any syscfg.yml file. Now code calls first auto-genereated function logcfg_log_module_name() to get those names. Signed-off-by: Jerzy Kasenberg <[email protected]> --- sys/log/full/src/log.c | 44 ++++++++------------------------------------ 1 file changed, 8 insertions(+), 36 deletions(-) diff --git a/sys/log/full/src/log.c b/sys/log/full/src/log.c index a1a2f1a57..68c04d6f0 100644 --- a/sys/log/full/src/log.c +++ b/sys/log/full/src/log.c @@ -230,48 +230,20 @@ const char * log_module_get_name(uint8_t module) { int idx; + const char *name; - switch (module) { -#ifdef MYNEWT_VAL_DFLT_LOG_MOD - case MYNEWT_VAL(DFLT_LOG_MOD): - return "DEFAULT"; -#endif -#ifdef MYNEWT_VAL_OS_LOG_MOD - case MYNEWT_VAL(OS_LOG_MOD): - return "OS"; -#endif -#ifdef MYNEWT_VAL_BLE_LL_LOG_MOD - case MYNEWT_VAL(BLE_LL_LOG_MOD): - return "NIMBLE_CTLR"; -#endif -#ifdef MYNEWT_VAL_BLE_HS_LOG_MOD - case MYNEWT_VAL(BLE_HS_LOG_MOD): - return "NIMBLE_HOST"; -#endif -#ifdef MYNEWT_VAL_NFFS_LOG_MOD - case MYNEWT_VAL(NFFS_LOG_MOD): - return "NFFS"; -#endif -#ifdef MYNEWT_VAL_REBOOT_LOG_MOD - case MYNEWT_VAL(REBOOT_LOG_MOD): - return "REBOOT"; -#endif -#ifdef MYNEWT_VAL_OC_LOG_MOD - case MYNEWT_VAL(OC_LOG_MOD): - return "IOTIVITY"; -#endif -#ifdef MYNEWT_VAL_TEST_LOG_MOD - case MYNEWT_VAL(TEST_LOG_MOD): - return "TEST"; -#endif - default: + /* Find module defined in syscfg.logcfg sections */ + name = logcfg_log_module_name(module); + + if (name == NULL) { + /* not in syscfg.logcfg, find module registered with log_module_register() */ idx = log_module_find_idx(module); if (idx != -1) { - return g_log_module_list[idx].name; + name = g_log_module_list[idx].name; } } - return NULL; + return name; } /**
