X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/6c85181339758553ef199ef0fda4ffe8e3efdcd6..f20e6902af6c77aef51f6c7050af641852de5283:/include/command.h diff --git a/include/command.h b/include/command.h index 5e55e47..54c0472 100644 --- a/include/command.h +++ b/include/command.h @@ -50,13 +50,12 @@ struct cmd_tbl_s { uint8_t maxargs; /* maximum number of arguments */ uint8_t flags; /* autorepeat allowed? */ /* Implementation function */ - command_ret_t (*cmd)(const FLASH struct cmd_tbl_s *, uint_fast8_t, int, char * const []); + command_ret_t (*cmd)(cmd_tbl_t *, uint_fast8_t, int, char * const []); const FLASH char *usage; /* Usage message (short) */ #ifdef CONFIG_SYS_LONGHELP const FLASH char *help; /* Help message (long) */ #endif cmd_tbl_t *subcmd; -// const FLASH struct cmd_tbl_s *subcommands; #ifdef CONFIG_AUTO_COMPLETE /* do auto completion on the arguments */ int (*complete)(int argc, char * const argv[], char last_char, int maxv, char *cmdv[]); @@ -80,8 +79,7 @@ cmd_process(uint_fast8_t flag, int argc, char * const argv[], uint_fast8_t *repe /* command.c */ -command_ret_t _do_help (cmd_tbl_t *cmd_start, cmd_tbl_t * cmdtp, uint_fast8_t flag, int argc, char * const argv[]); -cmd_tbl_t *find_cmd (const char *cmd, cmd_tbl_t *table); +command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]); int cmd_tbl_item_count(cmd_tbl_t *p); command_ret_t cmd_usage(cmd_tbl_t *cmdtp); @@ -125,8 +123,6 @@ static inline int bootm_maybe_autostart(cmd_tbl_t *cmdtp UNUSED, const char *cmd extern int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc, char *const argv[]); -extern command_ret_t do_reset(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]); - /* * Command Flags: */ @@ -136,8 +132,10 @@ extern command_ret_t do_reset(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, cha /* * Flags for command table: */ -#define CTBL_REPEAT 0x01 /* command is repeatable */ +#define CTBL_RPT 0x01 /* command is repeatable */ #define CTBL_SUBCMD 0x02 /* command has subcommands */ +#define CTBL_SUBCMDAUTO 0x04 /* execute subcommands whithout prefix */ +#define CTBL_DBG 0x08 /* command is only for debugging */ #ifdef CONFIG_AUTO_COMPLETE # define _CMD_COMPLETE(x) x, @@ -169,6 +167,8 @@ extern command_ret_t do_reset(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, cha CMD_TBL_ITEM_FULL(_name, _maxargs, _rep, _cmd, \ _usage, _help, _subtbl, NULL) +#define CMD_TBL_END(_table_start) { .subcmd = _table_start } + typedef command_ret_t (*do_cmd_t)(cmd_tbl_t *, uint_fast8_t, int, char * const []); extern cmd_tbl_t cmd_tbl[];