GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: Add a command to control the log output format

Browse source 
Add a 'log format' command which can display or change the log output
format. This is useful for changing how much information is displayed. The
ordering of the fields is fixed.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-12-28 13:14:19 -07:00
parent deca50fbd5
commit ad0e503991
1 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cmd/log.c
View file

@ -10,6 +10,8 @@
#include <dm.h> #include <dm.h>
#include <log.h> #include <log.h>
static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
static int do_log_level(cmd_tbl_t *cmdtp, int flag, int argc, static int do_log_level(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]) char * const argv[])
{ {
@ -21,11 +23,48 @@ static int do_log_level(cmd_tbl_t *cmdtp, int flag, int argc,
return 0; return 0;
} }
static int do_log_format(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[])
{
int i;
if (argc > 1) {
const char *str = argv[1];
if (!strcmp(str, "default")) {
gd->log_fmt = LOGF_DEFAULT;
} else if (!strcmp(str, "all")) {
gd->log_fmt = LOGF_ALL;
} else {
gd->log_fmt = 0;
for (; *str; str++) {
char *ptr = strchr(log_fmt_chars, *str);
if (!ptr) {
printf("Invalid log char '%c'\n", *str);
return CMD_RET_FAILURE;
}
gd->log_fmt |= 1 << (ptr - log_fmt_chars);
}
}
} else {
printf("Log format: ");
for (i = 0; i < LOGF_COUNT; i++) {
if (gd->log_fmt & (1 << i))
printf("%c", log_fmt_chars[i]);
}
printf("\n");
}
return 0;
}
static cmd_tbl_t log_sub[] = { static cmd_tbl_t log_sub[] = {
U_BOOT_CMD_MKENT(level, CONFIG_SYS_MAXARGS, 1, do_log_level, "", ""), U_BOOT_CMD_MKENT(level, CONFIG_SYS_MAXARGS, 1, do_log_level, "", ""),
#ifdef CONFIG_LOG_TEST #ifdef CONFIG_LOG_TEST
U_BOOT_CMD_MKENT(test, 2, 1, do_log_test, "", ""), U_BOOT_CMD_MKENT(test, 2, 1, do_log_test, "", ""),
#endif #endif
U_BOOT_CMD_MKENT(format, CONFIG_SYS_MAXARGS, 1, do_log_format, "", ""),
}; };
static int do_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int do_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@ -52,6 +91,10 @@ static char log_help_text[] =
#ifdef CONFIG_LOG_TEST #ifdef CONFIG_LOG_TEST
"log test - run log tests\n" "log test - run log tests\n"
#endif #endif
"log format <fmt> - set log output format. <fmt> is a string where\n"
"\teach letter indicates something that should be displayed:\n"
"\tc=category, l=level, F=file, L=line number, f=function, m=msg\n"
"\tor 'default', equivalent to 'fm', or 'all' for all"
; ;
#endif #endif