Fix merge problems

[u-boot] / include / command.h

diff --git a/include/command.h b/include/command.h
index b8c42e1c93056e2f72a703bf2e8e7ac7e237906b..4a27e9724768c8b5cf916684e9bf01770f32256d 100644 (file)
--- a/include/command.h
+++ b/include/command.h
@@ -27,6 +27,8 @@
 #ifndef __COMMAND_H
 #define __COMMAND_H
 
+#include <config.h>
+
 #ifndef NULL
 #define NULL   0
 #endif
@@ -46,6 +48,10 @@ struct cmd_tbl_s {
 #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;
@@ -57,6 +63,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
  *
@@ -65,7 +76,7 @@ cmd_tbl_t *find_cmd(const char *cmd);
  * void function (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
  */
 
-typedef        void    command_t (cmd_tbl_t *, int, int, char *[]);
+typedef        void    command_t (cmd_tbl_t *, int, int, char *[]);
 
 #endif /* __ASSEMBLY__ */
 
@@ -75,12 +86,6 @@ 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")))
 
 #ifdef  CFG_LONGHELP