LED Add documentation describing the status_led and colour led API.

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

diff --git a/common/main.c b/common/main.c
index 9a9fc9d00b9496bd2e45a7117558f4a65bb2bfd6..026edd1db23a19de127fd4b29ec9e69e43f87c99 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -34,7 +34,7 @@
 #include <malloc.h>            /* for free() prototype */
 #endif
 
-#ifdef CFG_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
 #include <hush.h>
 #endif
 
@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * Board-specific Platform code can reimplement show_boot_progress () if needed
  */
 void inline __show_boot_progress (int val) {}
-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
 
 #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);              /* for do_reset() prototype */
@@ -68,7 +68,7 @@ static int abortboot(int);
 
 #undef DEBUG_PARSER
 
-char        console_buffer[CFG_CBSIZE];                /* console I/O buffer   */
+char        console_buffer[CONFIG_SYS_CBSIZE];         /* 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       */
@@ -158,7 +158,19 @@ static __inline__ int abortboot(int bootdelay)
        /* In order to keep up with incoming data, check timeout only
         * when catch up.
         */
-       while (!abort && get_ticks() <= etime) {
+       do {
+               if (tstc()) {
+                       if (presskey_len < presskey_max) {
+                               presskey [presskey_len ++] = getc();
+                       }
+                       else {
+                               for (i = 0; i < presskey_max - 1; i ++)
+                                       presskey [i] = presskey [i + 1];
+
+                               presskey [i] = getc();
+                       }
+               }
+
                for (i = 0; i < sizeof(delaykey) / sizeof(delaykey[0]); i ++) {
                        if (delaykey[i].len > 0 &&
                            presskey_len >= delaykey[i].len &&
@@ -178,19 +190,8 @@ static __inline__ int abortboot(int bootdelay)
                                abort = 1;
                        }
                }
+       } while (!abort && get_ticks() <= etime);
 
-               if (tstc()) {
-                       if (presskey_len < presskey_max) {
-                               presskey [presskey_len ++] = getc();
-                       }
-                       else {
-                               for (i = 0; i < presskey_max - 1; i ++)
-                                       presskey [i] = presskey [i + 1];
-
-                               presskey [i] = getc();
-                       }
-               }
-       }
 #  if DEBUG_BOOTKEYS
        if (!abort)
                puts("key timeout\n");
@@ -272,8 +273,8 @@ static __inline__ int abortboot(int bootdelay)
 
 void main_loop (void)
 {
-#ifndef CFG_HUSH_PARSER
-       static char lastcommand[CFG_CBSIZE] = { 0, };
+#ifndef CONFIG_SYS_HUSH_PARSER
+       static char lastcommand[CONFIG_SYS_CBSIZE] = { 0, };
        int len;
        int rc = 1;
        int flag;
@@ -337,7 +338,7 @@ void main_loop (void)
        }
 #endif /* CONFIG_VERSION_VARIABLE */
 
-#ifdef CFG_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
        u_boot_hush_start ();
 #endif
 
@@ -355,7 +356,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-# ifndef CFG_HUSH_PARSER
+# ifndef CONFIG_SYS_HUSH_PARSER
                run_command (p, 0);
 # else
                parse_string_outer(p, FLAG_PARSE_SEMICOLON |
@@ -401,7 +402,7 @@ void main_loop (void)
                int prev = disable_ctrlc(1);    /* disable Control C checking */
 # endif
 
-# ifndef CFG_HUSH_PARSER
+# ifndef CONFIG_SYS_HUSH_PARSER
                run_command (s, 0);
 # else
                parse_string_outer(s, FLAG_PARSE_SEMICOLON |
@@ -417,7 +418,7 @@ void main_loop (void)
        if (menukey == CONFIG_MENUKEY) {
            s = getenv("menucmd");
            if (s) {
-# ifndef CFG_HUSH_PARSER
+# ifndef CONFIG_SYS_HUSH_PARSER
                run_command (s, 0);
 # else
                parse_string_outer(s, FLAG_PARSE_SEMICOLON |
@@ -438,7 +439,7 @@ void main_loop (void)
        /*
         * Main Loop for Monitor Command Processing
         */
-#ifdef CFG_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
        parse_file_outer();
        /* This point is never reached */
        for (;;);
@@ -452,7 +453,7 @@ void main_loop (void)
                        reset_cmd_timeout();
                }
 #endif
-               len = readline (CFG_PROMPT);
+               len = readline (CONFIG_SYS_PROMPT);
 
                flag = 0;       /* assume no special flags for now */
                if (len > 0)
@@ -483,7 +484,7 @@ void main_loop (void)
                        lastcommand[0] = 0;
                }
        }
-#endif /*CFG_HUSH_PARSER*/
+#endif /*CONFIG_SYS_HUSH_PARSER*/
 }
 
 #ifdef CONFIG_BOOT_RETRY_TIME
@@ -1042,7 +1043,7 @@ int readline_into_buffer (const char *const prompt, char * buffer)
                        /*
                         * Must be a normal character then
                         */
-                       if (n < CFG_CBSIZE-2) {
+                       if (n < CONFIG_SYS_CBSIZE-2) {
                                if (c == '\t') {        /* expand TABs          */
 #ifdef CONFIG_AUTO_COMPLETE
                                        /* if auto completion triggered just continue */
@@ -1111,7 +1112,7 @@ int parse_line (char *line, char *argv[])
 #ifdef DEBUG_PARSER
        printf ("parse_line: \"%s\"\n", line);
 #endif
-       while (nargs < CFG_MAXARGS) {
+       while (nargs < CONFIG_SYS_MAXARGS) {
 
                /* skip any white space */
                while ((*line == ' ') || (*line == '\t')) {
@@ -1144,7 +1145,7 @@ int parse_line (char *line, char *argv[])
                *line++ = '\0';         /* terminate current arg         */
        }
 
-       printf ("** Too many args (max. %d) **\n", CFG_MAXARGS);
+       printf ("** Too many args (max. %d) **\n", CONFIG_SYS_MAXARGS);
 
 #ifdef DEBUG_PARSER
        printf ("parse_line: nargs=%d\n", nargs);
@@ -1159,7 +1160,7 @@ static void process_macros (const char *input, char *output)
        char c, prev;
        const char *varname_start = NULL;
        int inputcnt = strlen (input);
-       int outputcnt = CFG_CBSIZE;
+       int outputcnt = CONFIG_SYS_CBSIZE;
        int state = 0;          /* 0 = waiting for '$'  */
 
        /* 1 = waiting for '(' or '{' */
@@ -1219,7 +1220,7 @@ static void process_macros (const char *input, char *output)
                case 2: /* Waiting for )        */
                        if (c == ')' || c == '}') {
                                int i;
-                               char envname[CFG_CBSIZE], *envval;
+                               char envname[CONFIG_SYS_CBSIZE], *envval;
                                int envcnt = input - varname_start - 1; /* Varname # of chars */
 
                                /* Get the varname */
@@ -1270,7 +1271,7 @@ static void process_macros (const char *input, char *output)
  *     0  - command executed but not repeatable, interrupted commands are
  *          always considered not repeatable
  *     -1 - not executed (unrecognized, bootd recursion or too many args)
- *           (If cmd is NULL or "" or longer than CFG_CBSIZE-1 it is
+ *           (If cmd is NULL or "" or longer than CONFIG_SYS_CBSIZE-1 it is
  *           considered unrecognized)
  *
  * WARNING:
@@ -1284,12 +1285,12 @@ static void process_macros (const char *input, char *output)
 int run_command (const char *cmd, int flag)
 {
        cmd_tbl_t *cmdtp;
-       char cmdbuf[CFG_CBSIZE];        /* working copy of cmd          */
+       char cmdbuf[CONFIG_SYS_CBSIZE]; /* working copy of cmd          */
        char *token;                    /* start of token in cmdbuf     */
        char *sep;                      /* end of token (separator) in cmdbuf */
-       char finaltoken[CFG_CBSIZE];
+       char finaltoken[CONFIG_SYS_CBSIZE];
        char *str = cmdbuf;
-       char *argv[CFG_MAXARGS + 1];    /* NULL terminated      */
+       char *argv[CONFIG_SYS_MAXARGS + 1];     /* NULL terminated      */
        int argc, inquotes;
        int repeatable = 1;
        int rc = 0;
@@ -1306,7 +1307,7 @@ int run_command (const char *cmd, int flag)
                return -1;      /* empty command */
        }
 
-       if (strlen(cmd) >= CFG_CBSIZE) {
+       if (strlen(cmd) >= CONFIG_SYS_CBSIZE) {
                puts ("## Command too long!\n");
                return -1;
        }
@@ -1370,7 +1371,7 @@ int run_command (const char *cmd, int flag)
 
                /* found - check max args */
                if (argc > cmdtp->maxargs) {
-                       printf ("Usage:\n%s\n", cmdtp->usage);
+                       cmd_usage(cmdtp);
                        rc = -1;
                        continue;
                }
@@ -1414,7 +1415,7 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        int i;
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -1425,7 +1426,7 @@ int do_run (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        printf ("## Error: \"%s\" not defined\n", argv[i]);
                        return 1;
                }
-#ifndef CFG_HUSH_PARSER
+#ifndef CONFIG_SYS_HUSH_PARSER
                if (run_command (arg, flag) == -1)
                        return 1;
 #else