From 8da60ec50c642816ed55a2004e99afea1cc25147 Mon Sep 17 00:00:00 2001
From: Leo C
Date: Sun, 8 Apr 2018 10:16:20 +0200
Subject: Call subcommands from main command processor

---
 avr/cmd_fat.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'avr/cmd_fat.c')

diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c
index 2257ddc..0fc6f83 100644
--- a/avr/cmd_fat.c
+++ b/avr/cmd_fat.c
@@ -539,7 +539,7 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 static
 command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]);
 
-cmd_tbl_t cmd_fat_sub[] = {
+cmd_tbl_t cmd_tbl_fat[] = {
 CMD_TBL_ITEM(
 	stat,	2,	CTBL_REPEAT,	do_stat,
 	"Show logical drive status",
@@ -594,16 +594,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_fat_sub, ARRAY_SIZE(cmd_fat_sub), cmdtp, flag, argc, argv);
+	return _do_help(cmd_tbl_fat, cmdtp, flag, argc, argv);
 }
 
 
@@ -618,7 +621,7 @@ command_ret_t do_fat(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const
 	argc--;
 	argv++;
 
-	cp = find_cmd_tbl(argv[0], cmd_fat_sub, ARRAY_SIZE(cmd_fat_sub));
+	cp = find_cmd(argv[0], cmd_tbl_fat);
 
 	if (cp)
 		return cp->cmd(cmdtp, flag, argc, argv);
-- 
cgit v1.2.3