diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2016-08-22 17:55:12 -0700 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2016-08-24 16:30:10 +0000 |
| commit | bb15561db56728b83ee7fe35e534da7577a7729d (patch) | |
| tree | e586ee3b18c8fda464da38b42a06845f0d7f6786 /include/console.h | |
| parent | f322e32a3ec052be3f0c226145448fed63aa7ef9 (diff) | |
| download | chrome-ec-bb15561db56728b83ee7fe35e534da7577a7729d.tar.gz | |
cleanup: DECLARE_CONSOLE_COMMAND only needs 4 args
Since pretty much always, we've declared console commands to take
a "longhelp" argument with detailed explanations of what the
command does. But since almost as long, we've never actually used
that argument for anything - we just silently throw it away in
the macro. There's only one command (usbchargemode) that even
thinks it defines that argument.
We're never going to use this, let's just get rid of it.
BUG=none
BRANCH=none
CQ-DEPEND=CL:*279060
CQ-DEPEND=CL:*279158
CQ-DEPEND=CL:*279037
TEST=make buildall; tested on Cr50 hardware
Everything builds. Since we never used this arg anyway, there had
better not be any difference in the result.
Change-Id: Id3f71a53d02e3dc625cfcc12aa71ecb50e35eb9f
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/374163
Reviewed-by: Myles Watson <mylesgw@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'include/console.h')
| -rw-r--r-- | include/console.h | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/include/console.h b/include/console.h index f1f06b19bd..f0c96a167f 100644 --- a/include/console.h +++ b/include/console.h @@ -101,27 +101,32 @@ void console_has_input(void); * int handler(int argc, char **argv) * @param argdesc String describing arguments to command; NULL if none. * @param shorthelp String with one-line description of command. - * @param longhelp String with long description of command. */ #ifndef HAS_TASK_CONSOLE -#define DECLARE_CONSOLE_COMMAND(name, routine, argdesc, shorthelp, longhelp) \ - int (routine)(int argc, char **argv) __attribute__((unused)) +#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, SHORTHELP) \ + int (ROUTINE)(int argc, char **argv) __attribute__((unused)) #elif defined(CONFIG_CONSOLE_CMDHELP) -#define DECLARE_CONSOLE_COMMAND(name, routine, argdesc, shorthelp, longhelp) \ - static const char __con_cmd_label_##name[] = #name; \ - struct size_check##name { \ - int field[2 * (sizeof(__con_cmd_label_##name) < 16) - 1]; }; \ - const struct console_command __keep __con_cmd_##name \ - __attribute__((section(".rodata.cmds." #name))) \ - = {__con_cmd_label_##name, routine, argdesc, shorthelp} +#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, SHORTHELP) \ + static const char __con_cmd_label_##NAME[] = #NAME; \ + struct size_check##NAME { \ + int field[2 * (sizeof(__con_cmd_label_##NAME) < 16) - 1]; }; \ + const struct console_command __keep __con_cmd_##NAME \ + __attribute__((section(".rodata.cmds." #NAME))) = \ + { .name = __con_cmd_label_##NAME, \ + .handler = ROUTINE, \ + .argdesc = ARGDESC, \ + .shorthelp = SHORTHELP \ + } #else -#define DECLARE_CONSOLE_COMMAND(name, routine, argdesc, shorthelp, longhelp) \ - static const char __con_cmd_label_##name[] = #name; \ - struct size_check##name { \ - int field[2 * (sizeof(__con_cmd_label_##name) < 16) - 1]; }; \ - const struct console_command __keep __con_cmd_##name \ - __attribute__((section(".rodata.cmds." #name))) \ - = {__con_cmd_label_##name, routine} +#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, SHORTHELP) \ + static const char __con_cmd_label_##NAME[] = #NAME; \ + struct size_check##NAME { \ + int field[2 * (sizeof(__con_cmd_label_##NAME) < 16) - 1]; }; \ + const struct console_command __keep __con_cmd_##NAME \ + __attribute__((section(".rodata.cmds." #NAME))) = \ + { .name = __con_cmd_label_##NAME, \ + .handler = ROUTINE, \ + } #endif #endif /* __CROS_EC_CONSOLE_H */ |