Merge branch 'master' of git://www.denx.de/git/u-boot-video

[u-boot] / include / command.h

diff --git a/include/command.h b/include/command.h
index a39c12f9afed1d21ea56db8fc043813ee72f5716..0597c10dafe2e566f4a8773946beeda4a2d0237e 100644 (file)
--- a/include/command.h
+++ b/include/command.h
@@ -40,13 +40,16 @@ struct cmd_tbl_s {
        char            *name;          /* Command Name                 */
        int             maxargs;        /* maximum number of arguments  */
        int             repeatable;     /* autorepeat allowed?          */
-
                                        /* Implementation function      */
        int             (*cmd)(struct cmd_tbl_s *, int, int, char *[]);
        char            *usage;         /* Usage message        (short) */
 #ifdef CFG_LONGHELP
        char            *help;          /* Help  message        (long)  */
 #endif
+#ifdef CONFIG_AUTO_COMPLETE
+       /* do auto completion on the arguments */
+       int             (*complete)(int argc, char *argv[], char last_char, int maxv, char *cmdv[]);
+#endif
 };
 
 typedef struct cmd_tbl_s       cmd_tbl_t;
@@ -58,6 +61,11 @@ extern cmd_tbl_t  __u_boot_cmd_end;
 /* common/command.c */
 cmd_tbl_t *find_cmd(const char *cmd);
 
+#ifdef CONFIG_AUTO_COMPLETE
+extern void install_auto_complete(void);
+extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp);
+#endif
+
 /*
  * Monitor Command
  *
@@ -76,24 +84,17 @@ typedef     void    command_t (cmd_tbl_t *, int, int, char *[]);
 #define CMD_FLAG_REPEAT                0x0001  /* repeat last command          */
 #define CMD_FLAG_BOOTD         0x0002  /* command is from bootd        */
 
-/*
- * Configurable monitor commands definitions have been moved
- * to include/cmd_confdefs.h
- */
-
-
 #define Struct_Section  __attribute__ ((unused,section (".u_boot_cmd")))
-#define U_BOOT_CMD(x)  __u_boot_cmd_##x Struct_Section
 
 #ifdef  CFG_LONGHELP
 
-#define MK_CMD_ENTRY(name,maxargs,rep,cmd,usage,help)  \
-                       { name, maxargs, rep, cmd, usage, help }
+#define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) \
+cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage, help}
 
 #else  /* no long help info */
 
-#define MK_CMD_ENTRY(name,maxargs,rep,cmd,usage,help)  \
-                       { name, maxargs, rep, cmd, usage }
+#define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) \
+cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage}
 
 #endif /* CFG_LONGHELP */