Add generic, reusable menu code

[u-boot] / common / command.c

diff --git a/common/command.c b/common/command.c
index ef4a081109d3c6155f0692c20d9c0278abef936f..ed931d748c095a1cd89ff0f702e10dccb72b1611 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -140,7 +140,7 @@ cmd_tbl_t *find_cmd (const char *cmd)
        return find_cmd_tbl(cmd, &__u_boot_cmd_start, len);
 }
 
-int cmd_usage(cmd_tbl_t *cmdtp)
+int cmd_usage(const cmd_tbl_t *cmdtp)
 {
        printf("%s - %s\n\n", cmdtp->name, cmdtp->usage);
 
@@ -162,7 +162,6 @@ int cmd_usage(cmd_tbl_t *cmdtp)
 
 int var_complete(int argc, char * const argv[], char last_char, int maxv, char *cmdv[])
 {
-#if 0 /* need to reimplement */
        static char tmp_buf[512];
        int space;
 
@@ -173,7 +172,7 @@ int var_complete(int argc, char * const argv[], char last_char, int maxv, char *
 
        if (!space && argc == 2)
                return env_complete(argv[1], maxv, cmdv, sizeof(tmp_buf), tmp_buf);
-#endif
+
        return 0;
 }
 
@@ -475,6 +474,12 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
                        addr = (ulong)(cmdtp->help) + gd->reloc_off;
                        cmdtp->help = (char *)addr;
                }
+#endif
+#ifdef CONFIG_AUTO_COMPLETE
+               if (cmdtp->complete) {
+                       addr = (ulong)(cmdtp->complete) + gd->reloc_off;
+                       cmdtp->complete = (char *)addr;
+               }
 #endif
                cmdtp++;
        }