From: Sean Anderson <seanga2@gmail.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 12/22] cmd: log: Use sub-commands for log
Date: Sat, 10 Oct 2020 15:43:37 -0400 [thread overview]
Message-ID: <20201010194347.90096-13-seanga2@gmail.com> (raw)
In-Reply-To: <20201010194347.90096-1-seanga2@gmail.com>
This reduces duplicate code, and makes adding new sub-commands easier.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
---
(no changes since v1)
cmd/log.c | 37 +++++++------------------------------
1 file changed, 7 insertions(+), 30 deletions(-)
diff --git a/cmd/log.c b/cmd/log.c
index 16a6ef7539..e55ace9e14 100644
--- a/cmd/log.c
+++ b/cmd/log.c
@@ -103,33 +103,6 @@ static int do_log_rec(struct cmd_tbl *cmdtp, int flag, int argc,
return 0;
}
-static struct cmd_tbl log_sub[] = {
- U_BOOT_CMD_MKENT(level, CONFIG_SYS_MAXARGS, 1, do_log_level, "", ""),
-#if CONFIG_IS_ENABLED(LOG_TEST)
- U_BOOT_CMD_MKENT(test, 2, 1, do_log_test, "", ""),
-#endif
- U_BOOT_CMD_MKENT(format, CONFIG_SYS_MAXARGS, 1, do_log_format, "", ""),
- U_BOOT_CMD_MKENT(rec, CONFIG_SYS_MAXARGS, 1, do_log_rec, "", ""),
-};
-
-static int do_log(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
- struct cmd_tbl *cp;
-
- if (argc < 2)
- return CMD_RET_USAGE;
-
- /* drop initial "log" arg */
- argc--;
- argv++;
-
- cp = find_cmd_tbl(argv[0], log_sub, ARRAY_SIZE(log_sub));
- if (cp)
- return cp->cmd(cmdtp, flag, argc, argv);
-
- return CMD_RET_USAGE;
-}
-
#ifdef CONFIG_SYS_LONGHELP
static char log_help_text[] =
"level - get/set log level\n"
@@ -145,7 +118,11 @@ static char log_help_text[] =
;
#endif
-U_BOOT_CMD(
- log, CONFIG_SYS_MAXARGS, 1, do_log,
- "log system", log_help_text
+U_BOOT_CMD_WITH_SUBCMDS(log, "log system", log_help_text,
+ U_BOOT_SUBCMD_MKENT(level, 2, 1, do_log_level),
+#if CONFIG_IS_ENABLED(LOG_TEST)
+ U_BOOT_SUBCMD_MKENT(test, 2, 1, do_log_test),
+#endif
+ U_BOOT_SUBCMD_MKENT(format, 2, 1, do_log_format),
+ U_BOOT_SUBCMD_MKENT(rec, 7, 1, do_log_rec),
);
--
2.28.0
next prev parent reply other threads:[~2020-10-10 19:43 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-10 19:43 [PATCH v2 00/22] log: Add commands for manipulating filters Sean Anderson
2020-10-10 19:43 ` [PATCH v2 01/22] log: Fix missing negation of ENOMEM Sean Anderson
2020-10-10 19:43 ` [PATCH v2 02/22] log: Fix incorrect documentation of log_filter.cat_list Sean Anderson
2020-10-10 19:43 ` [PATCH v2 03/22] log: Add additional const qualifier to arrays Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 04/22] log: Add new category names to log_cat_name Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 05/22] log: Use CONFIG_IS_ENABLED() for LOG_TEST Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-12 16:56 ` Sean Anderson
2020-10-14 13:07 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 06/22] log: Expose some helper functions Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 07/22] log: Add function to create a filter with flags Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 08/22] log: Add filter flag to deny on match Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 09/22] test: Add tests for LOGFF_DENY Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 10/22] log: Add filter flag to match greater than a log level Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 11/22] test: Add test for LOGFF_MIN Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` Sean Anderson [this message]
2020-10-12 3:35 ` [PATCH v2 12/22] cmd: log: Use sub-commands for log Simon Glass
2020-10-10 19:43 ` [PATCH v2 13/22] cmd: log: Split off log level parsing Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 14/22] cmd: log: Move log test to end of help string Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 15/22] cmd: log: Add commands to list categories and drivers Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 16/22] cmd: log: Make "log level" print all log levels Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 17/22] lib: Add getopt Sean Anderson
2020-10-10 19:43 ` [PATCH v2 18/22] test: Add a test for getopt Sean Anderson
2020-10-10 19:43 ` [PATCH v2 19/22] cmd: log: Add commands to manipulate filters Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 20/22] test: Add a test for log filter-* Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 21/22] doc: Add log kerneldocs to documentation Sean Anderson
2020-10-12 3:35 ` Simon Glass
2020-10-10 19:43 ` [PATCH v2 22/22] doc: Update logging documentation Sean Anderson
2020-10-12 3:35 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201010194347.90096-13-seanga2@gmail.com \
--to=seanga2@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox