altos: Remove spurious ao_mma655x_spi_index variable

[fw/altos] / src / kernel / ao_cmd.c

diff --git a/src/kernel/ao_cmd.c b/src/kernel/ao_cmd.c
index 10716afd5e8e0ffe9fab17fb459874a6dfa748d5..7bb4654e775e472d486fbf4985989b2c8d05614d 100644 (file)
--- a/src/kernel/ao_cmd.c
+++ b/src/kernel/ao_cmd.c
@@ -24,13 +24,15 @@ __pdata uint32_t ao_cmd_lex_u32;
 __pdata char   ao_cmd_lex_c;
 __pdata enum ao_cmd_status ao_cmd_status;
 
+#ifndef AO_CMD_LEN
 #if AO_PYRO_NUM
-#define CMD_LEN 128
+#define AO_CMD_LEN 128
 #else
-#define CMD_LEN        48
+#define AO_CMD_LEN     48
+#endif
 #endif
 
-static __xdata char    cmd_line[CMD_LEN];
+static __xdata char    cmd_line[AO_CMD_LEN];
 static __pdata uint8_t cmd_len;
 static __pdata uint8_t cmd_i;
 
@@ -48,8 +50,8 @@ backspace(void)
        ao_put_string ("\010 \010");
 }
 
-static void
-readline(void)
+void
+ao_cmd_readline(void)
 {
        char c;
        if (ao_echo())
@@ -88,7 +90,7 @@ readline(void)
                        break;
                }
 
-               if (cmd_len >= CMD_LEN - 2)
+               if (cmd_len >= AO_CMD_LEN - 2)
                        continue;
                cmd_line[cmd_len++] = c;
                if (ao_echo())
@@ -99,12 +101,13 @@ readline(void)
        cmd_i = 0;
 }
 
-void
+char
 ao_cmd_lex(void)
 {
        ao_cmd_lex_c = '\n';
        if (cmd_i < cmd_len)
                ao_cmd_lex_c = cmd_line[cmd_i++];
+       return ao_cmd_lex_c;
 }
 
 static void
@@ -301,13 +304,13 @@ version(void)
               , ao_flight_number
 #endif
 #if HAS_LOG
-              , ao_log_format
+              , AO_LOG_FORMAT
 #if !DISABLE_LOG_SPACE
               , (unsigned long) ao_storage_log_max
 #endif
 #endif
 #if defined(AO_BOOT_APPLICATION_BASE) && defined(AO_BOOT_APPLICATION_BOUND)
-              , (uint32_t) AO_BOOT_APPLICATION_BOUND - (uint32_t) AO_BOOT_APPLICATION_BASE
+              , (unsigned) ((uint32_t) AO_BOOT_APPLICATION_BOUND - (uint32_t) AO_BOOT_APPLICATION_BASE)
 #endif
                );
        printf("software-version %s\n", ao_version);
@@ -352,7 +355,7 @@ report(void)
        switch(ao_cmd_status) {
        case ao_cmd_lex_error:
        case ao_cmd_syntax_error:
-               puts("Syntax error");
+               ao_put_string("Syntax error\n");
                ao_cmd_status = 0;
        default:
                break;
@@ -376,7 +379,7 @@ ao_cmd(void)
        void (*__xdata func)(void);
 
        for (;;) {
-               readline();
+               ao_cmd_readline();
                ao_cmd_lex();
                ao_cmd_white();
                c = ao_cmd_lex_c;
@@ -420,11 +423,13 @@ ao_loader(void)
 }
 #endif
 
+#if HAS_TASK
 __xdata struct ao_task ao_cmd_task;
+#endif
 
 __code struct ao_cmds  ao_base_cmds[] = {
        { help,         "?\0Help" },
-#if HAS_TASK_INFO
+#if HAS_TASK_INFO && HAS_TASK
        { ao_task_info, "T\0Tasks" },
 #endif
        { echo,         "E <0 off, 1 on>\0Echo" },
@@ -442,5 +447,7 @@ void
 ao_cmd_init(void)
 {
        ao_cmd_register(&ao_base_cmds[0]);
+#if HAS_TASK
        ao_add_task(&ao_cmd_task, ao_cmd, "cmd");
+#endif
 }