Merge tag 'dm-pull-22aug20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

[platform/kernel/u-boot.git] / cmd / log.c

diff --git a/cmd/log.c b/cmd/log.c
index 12bac0e..6afe6ea 100644 (file)
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2017 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
@@ -12,19 +11,27 @@
 
 static char log_fmt_chars[LOGF_COUNT] = "clFLfm";
 
-static int do_log_level(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_log_level(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
 {
-       if (argc > 1)
-               gd->default_log_level = simple_strtol(argv[1], NULL, 10);
-       else
+       if (argc > 1) {
+               long log_level = simple_strtol(argv[1], NULL, 10);
+
+               if (log_level < 0 || log_level > _LOG_MAX_LEVEL) {
+                       printf("Only log levels <= %d are supported\n",
+                              _LOG_MAX_LEVEL);
+                       return CMD_RET_FAILURE;
+               }
+               gd->default_log_level = log_level;
+       } else {
                printf("Default log level: %d\n", gd->default_log_level);
+       }
 
        return 0;
 }
 
-static int do_log_format(cmd_tbl_t *cmdtp, int flag, int argc,
-                        char * const argv[])
+static int do_log_format(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
 {
        int i;
 
@@ -32,7 +39,7 @@ static int do_log_format(cmd_tbl_t *cmdtp, int flag, int argc,
                const char *str = argv[1];
 
                if (!strcmp(str, "default")) {
-                       gd->log_fmt = LOGF_DEFAULT;
+                       gd->log_fmt = log_get_default_format();
                } else if (!strcmp(str, "all")) {
                        gd->log_fmt = LOGF_ALL;
                } else {
@@ -59,7 +66,8 @@ static int do_log_format(cmd_tbl_t *cmdtp, int flag, int argc,
        return 0;
 }
 
-static int do_log_rec(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        enum log_category_t cat;
        enum log_level_t level;
@@ -95,7 +103,7 @@ static int do_log_rec(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        return 0;
 }
 
-static cmd_tbl_t log_sub[] = {
+static struct cmd_tbl log_sub[] = {
        U_BOOT_CMD_MKENT(level, CONFIG_SYS_MAXARGS, 1, do_log_level, "", ""),
 #ifdef CONFIG_LOG_TEST
        U_BOOT_CMD_MKENT(test, 2, 1, do_log_test, "", ""),
@@ -104,9 +112,9 @@ static cmd_tbl_t log_sub[] = {
        U_BOOT_CMD_MKENT(rec, CONFIG_SYS_MAXARGS, 1, do_log_rec, "", ""),
 };
 
-static int do_log(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_log(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
-       cmd_tbl_t *cp;
+       struct cmd_tbl *cp;
 
        if (argc < 2)
                return CMD_RET_USAGE;
@@ -131,7 +139,7 @@ static char log_help_text[] =
        "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\n"
+       "\tor 'default', or 'all' for all\n"
        "log rec <category> <level> <file> <line> <func> <message> - "
                "output a log record"
        ;