Call subcommands from main command processor

[z180-stamp.git] / avr / cmd_sd.c

diff --git a/avr/cmd_sd.c b/avr/cmd_sd.c
index f3c5df418604acff0e98d708e76867623c53ac20..45bb54046d87ec4458f4f898eaa81ad1ac539d6f 100644 (file)
--- a/avr/cmd_sd.c
+++ b/avr/cmd_sd.c
@@ -319,7 +319,7 @@ command_ret_t do_ioctl_sync(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char
 static
 command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]);
 
-cmd_tbl_t cmd_sd_sub[] = {
+cmd_tbl_t cmd_tbl_sd[] = {
 CMD_TBL_ITEM(
        status, 2,                      CTBL_REPEAT,    do_status,
        "Socket staus",
@@ -371,16 +371,19 @@ CMD_TBL_ITEM(
 #ifdef  CONFIG_SYS_LONGHELP
        FSTR(""),
 #endif /* CONFIG_SYS_LONGHELP */
+       NULL,
 #ifdef CONFIG_AUTO_COMPLETE
-       0,
+       NULL,
 #endif
 },
+/* Mark end of table */
+{ 0 },
 };
 
 static
 command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[])
 {
-       return _do_help(cmd_sd_sub, ARRAY_SIZE(cmd_sd_sub), cmdtp, flag, argc, argv);
+       return _do_help(cmd_tbl_sd, cmdtp, flag, argc, argv);
 }
 
 
@@ -395,7 +398,7 @@ command_ret_t do_sd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
        argc--;
        argv++;
 
-       cp = find_cmd_tbl(argv[0], cmd_sd_sub, ARRAY_SIZE(cmd_sd_sub));
+       cp = find_cmd(argv[0], cmd_tbl_sd);
 
        if (cp)
                return cp->cmd(cmdtp, flag, argc, argv);