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

[karo-tx-uboot.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 42f4d025dcb3abd5f1bd6c9aecd2ff8cdb7a1bfc..e96c95a038c29be5f7aa5dfa57fa6c9209710e7b 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -30,6 +30,7 @@
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
+#include <version.h>
 #ifdef CONFIG_MODEM_SUPPORT
 #include <malloc.h>            /* for free() prototype */
 #endif
@@ -39,6 +40,7 @@
 #endif
 
 #include <post.h>
+#include <linux/ctype.h>
 
 #if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
 DECLARE_GLOBAL_DATA_PTR;
@@ -51,22 +53,18 @@ void inline __show_boot_progress (int val) {}
 void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
 
 #if defined(CONFIG_UPDATE_TFTP)
-void update_tftp (void);
+int update_tftp (ulong addr);
 #endif /* CONFIG_UPDATE_TFTP */
 
 #define MAX_DELAY_STOP_STR 32
 
-#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
-static int abortboot(int);
-#endif
-
 #undef DEBUG_PARSER
 
 char        console_buffer[CONFIG_SYS_CBSIZE + 1];     /* console I/O buffer   */
 
 static char * delete_char (char *buffer, char *p, int *colp, int *np, int plen);
-static char erase_seq[] = "\b \b";             /* erase sequence       */
-static char   tab_seq[] = "        ";          /* used to expand TABs  */
+static const char erase_seq[] = "\b \b";               /* erase sequence       */
+static const char   tab_seq[] = "        ";            /* used to expand TABs  */
 
 #ifdef CONFIG_BOOT_RETRY_TIME
 static uint64_t endtime = 0;  /* must be set, default is instant timeout */
@@ -86,12 +84,14 @@ extern void mdm_init(void); /* defined in board.c */
 
 /***************************************************************************
  * Watch for 'delay' seconds for autoboot stop or autoboot delay string.
- * returns: 0 -  no key string, allow autoboot
- *          1 - got key string, abort
+ * returns: 0 -  no key string, allow autoboot 1 - got key string, abort
  */
 #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
 # if defined(CONFIG_AUTOBOOT_KEYED)
-static __inline__ int abortboot(int bootdelay)
+#ifndef CONFIG_MENU
+static inline
+#endif
+int abortboot(int bootdelay)
 {
        int abort = 0;
        uint64_t etime = endtick(bootdelay);
@@ -205,7 +205,10 @@ static __inline__ int abortboot(int bootdelay)
 static int menukey = 0;
 #endif
 
-static __inline__ int abortboot(int bootdelay)
+#ifndef CONFIG_MENU
+static inline
+#endif
+int abortboot(int bootdelay)
 {
        int abort = 0;
 
@@ -263,6 +266,28 @@ static __inline__ int abortboot(int bootdelay)
 # endif        /* CONFIG_AUTOBOOT_KEYED */
 #endif /* CONFIG_BOOTDELAY >= 0  */
 
+/*
+ * Return 0 on success, or != 0 on error.
+ */
+#ifndef CONFIG_CMD_PXE
+static inline
+#endif
+int run_command2(const char *cmd, int flag)
+{
+#ifndef CONFIG_SYS_HUSH_PARSER
+       /*
+        * run_command can return 0 or 1 for success, so clean up its result.
+        */
+       if (run_command(cmd, flag) == -1)
+               return 1;
+
+       return 0;
+#else
+       return parse_string_outer(cmd,
+                       FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP);
+#endif
+}
+
 /****************************************************************************/
 
 void main_loop (void)
@@ -288,17 +313,6 @@ void main_loop (void)
        char bcs_set[16];
 #endif /* CONFIG_BOOTCOUNT_LIMIT */
 
-#if defined(CONFIG_VFD) && defined(VFD_TEST_LOGO)
-       ulong bmp = 0;          /* default bitmap */
-       extern int trab_vfd (ulong bitmap);
-
-#ifdef CONFIG_MODEM_SUPPORT
-       if (do_mdm_init)
-               bmp = 1;        /* alternate bitmap */
-#endif
-       trab_vfd (bmp);
-#endif /* CONFIG_VFD && VFD_TEST_LOGO */
-
 #ifdef CONFIG_BOOTCOUNT_LIMIT
        bootcount = bootcount_load();
        bootcount++;
@@ -322,8 +336,6 @@ void main_loop (void)
 
 #ifdef CONFIG_VERSION_VARIABLE
        {
-               extern char version_string[];
-
                setenv ("ver", version_string);  /* set version variable */
        }
 #endif /* CONFIG_VERSION_VARIABLE */
@@ -342,12 +354,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-# ifndef CONFIG_SYS_HUSH_PARSER
-               run_command (p, 0);
-# else
-               parse_string_outer(p, FLAG_PARSE_SEMICOLON |
-                                   FLAG_EXIT_FROM_LOOP);
-# endif
+               run_command2(p, 0);
 
 # ifdef CONFIG_AUTOBOOT_KEYED
                disable_ctrlc(prev);    /* restore Control C checking */
@@ -356,7 +363,7 @@ void main_loop (void)
 #endif /* CONFIG_PREBOOT */
 
 #if defined(CONFIG_UPDATE_TFTP)
-       update_tftp ();
+       update_tftp (0UL);
 #endif /* CONFIG_UPDATE_TFTP */
 
 #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
@@ -392,12 +399,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-# ifndef CONFIG_SYS_HUSH_PARSER
-               run_command (s, 0);
-# else
-               parse_string_outer(s, FLAG_PARSE_SEMICOLON |
-                                   FLAG_EXIT_FROM_LOOP);
-# endif
+               run_command2(s, 0);
 
 # ifdef CONFIG_AUTOBOOT_KEYED
                disable_ctrlc(prev);    /* restore Control C checking */
@@ -406,15 +408,9 @@ void main_loop (void)
 
 # ifdef CONFIG_MENUKEY
        if (menukey == CONFIG_MENUKEY) {
-           s = getenv("menucmd");
-           if (s) {
-# ifndef CONFIG_SYS_HUSH_PARSER
-               run_command (s, 0);
-# else
-               parse_string_outer(s, FLAG_PARSE_SEMICOLON |
-                                   FLAG_EXIT_FROM_LOOP);
-# endif
-           }
+               s = getenv("menucmd");
+               if (s)
+                       run_command2(s, 0);
        }
 #endif /* CONFIG_MENUKEY */
 #endif /* CONFIG_BOOTDELAY */
@@ -1104,9 +1100,8 @@ int parse_line (char *line, char *argv[])
        while (nargs < CONFIG_SYS_MAXARGS) {
 
                /* skip any white space */
-               while ((*line == ' ') || (*line == '\t')) {
+               while (isblank(*line))
                        ++line;
-               }
 
                if (*line == '\0') {    /* end of line, no more args    */
                        argv[nargs] = NULL;
@@ -1119,9 +1114,8 @@ int parse_line (char *line, char *argv[])
                argv[nargs++] = line;   /* begin of argument string     */
 
                /* find end of string */
-               while (*line && (*line != ' ') && (*line != '\t')) {
+               while (*line && !isblank(*line))
                        ++line;
-               }
 
                if (*line == '\0') {    /* end of line, no more args    */
                        argv[nargs] = NULL;
@@ -1413,14 +1407,9 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
                        printf ("## Error: \"%s\" not defined\n", argv[i]);
                        return 1;
                }
-#ifndef CONFIG_SYS_HUSH_PARSER
-               if (run_command (arg, flag) == -1)
-                       return 1;
-#else
-               if (parse_string_outer(arg,
-                   FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP) != 0)
+
+               if (run_command2(arg, flag) != 0)
                        return 1;
-#endif
        }
        return 0;
 }