diff options
Diffstat (limited to 'include/command.h')
| -rw-r--r-- | include/command.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/command.h b/include/command.h index 15ce8d4862..347ad2f3ec 100644 --- a/include/command.h +++ b/include/command.h @@ -47,7 +47,8 @@ struct command { /* Implementation function */ int (*cmd)(int, char *[]); int (*complete)(struct string_list *sl, char *instr); - const char *usage; /* Usage message (short) */ + const char *desc; /* Short command description, start with lowercase */ + const char *opts; /* command options */ struct list_head list; /* List of commands */ uint32_t group; @@ -74,7 +75,7 @@ void barebox_cmd_usage(struct command *cmdtp); #define COMMAND_ERROR 1 #define COMMAND_ERROR_USAGE 2 -/* Note: keep this list in sync with commands/command.c */ +/* Note: keep this list in sync with commands/help.c */ #define CMD_GRP_INFO 1 #define CMD_GRP_BOOT 2 #define CMD_GRP_ENV 3 @@ -110,10 +111,8 @@ const struct command __barebox_cmd_##_name \ #define BAREBOX_CMD_HELP_START(_name) \ static const __maybe_unused char cmd_##_name##_help[] = -#define BAREBOX_CMD_HELP_USAGE(_name) "Usage: " _name -#define BAREBOX_CMD_HELP_SHORT(_text) _text -#define BAREBOX_CMD_HELP_OPT(_opt, _desc) _opt "\t" _desc -#define BAREBOX_CMD_HELP_TEXT(_text) _text +#define BAREBOX_CMD_HELP_OPT(_opt, _desc) "\t" _opt "\t" _desc "\n" +#define BAREBOX_CMD_HELP_TEXT(_text) _text "\n" #define BAREBOX_CMD_HELP_END ; #ifdef CONFIG_LONGHELP @@ -124,6 +123,10 @@ static const __maybe_unused char cmd_##_name##_help[] = #define BAREBOX_CMD_GROUP(grp) .group = grp, +#define BAREBOX_CMD_DESC(text) .desc = text, + +#define BAREBOX_CMD_OPTS(text) .opts = text, + #endif /* DOXYGEN_SHOULD_SKIP_THIS */ int register_command(struct command *); |