changes in preparation for upload to Debian

[fw/altos] / src / ao_cmd.c

diff --git a/src/ao_cmd.c b/src/ao_cmd.c
index 3f020dc3a3b30a38a97402cb9894a7fa3f35f1ff..1442ebea8eafc9a32e31ae18006bf61ef2af9316 100644 (file)
--- a/src/ao_cmd.c
+++ b/src/ao_cmd.c
@@ -17,21 +17,21 @@
 
 #include "ao.h"
 
-__xdata uint16_t ao_cmd_lex_i;
-__xdata uint32_t ao_cmd_lex_u32;
-__xdata char   ao_cmd_lex_c;
-__xdata enum ao_cmd_status ao_cmd_status;
+__pdata uint16_t ao_cmd_lex_i;
+__pdata uint32_t ao_cmd_lex_u32;
+__pdata char   ao_cmd_lex_c;
+__pdata enum ao_cmd_status ao_cmd_status;
 
 #define CMD_LEN        32
 
 static __xdata char    cmd_line[CMD_LEN];
-static __xdata uint8_t cmd_len;
-static __xdata uint8_t cmd_i;
+static __pdata uint8_t cmd_len;
+static __pdata uint8_t cmd_i;
 
 static void
-put_string(char *s)
+put_string(__code char *s)
 {
-       __xdata char    c;
+       char    c;
        while (c = *s++)
                putchar(c);
 }
@@ -39,7 +39,7 @@ put_string(char *s)
 static void
 readline(void)
 {
-       __xdata char c;
+       __pdata char c;
        if (ao_echo())
                put_string("> ");
        cmd_len = 0;
@@ -110,9 +110,8 @@ putnibble(uint8_t v)
 void
 ao_cmd_put16(uint16_t v)
 {
-       int8_t i;
-       for (i = 3; i >= 0; i--)
-               putnibble((v >> (i << 2)) & 0xf);
+       ao_cmd_put8(v >> 8);
+       ao_cmd_put8(v);
 }
 
 void
@@ -132,19 +131,21 @@ ao_cmd_white(void)
 void
 ao_cmd_hex(void)
 {
-       __xdata uint8_t r = ao_cmd_lex_error;
+       __pdata uint8_t r = ao_cmd_lex_error;
+       uint8_t n;
 
        ao_cmd_lex_i = 0;
        ao_cmd_white();
        for(;;) {
                if ('0' <= ao_cmd_lex_c && ao_cmd_lex_c <= '9')
-                       ao_cmd_lex_i = (ao_cmd_lex_i << 4) | (ao_cmd_lex_c - '0');
+                       n = (ao_cmd_lex_c - '0');
                else if ('a' <= ao_cmd_lex_c && ao_cmd_lex_c <= 'f')
-                       ao_cmd_lex_i = (ao_cmd_lex_i << 4) | (ao_cmd_lex_c - 'a' + 10);
+                       n = (ao_cmd_lex_c - 'a' + 10);
                else if ('A' <= ao_cmd_lex_c && ao_cmd_lex_c <= 'F')
-                       ao_cmd_lex_i = (ao_cmd_lex_i << 4) | (ao_cmd_lex_c - 'A' + 10);
+                       n = (ao_cmd_lex_c - 'A' + 10);
                else
                        break;
+               ao_cmd_lex_i = (ao_cmd_lex_i << 4) | n;
                r = ao_cmd_success;
                ao_cmd_lex();
        }
@@ -155,7 +156,7 @@ ao_cmd_hex(void)
 void
 ao_cmd_decimal(void)
 {
-       __xdata uint8_t r = ao_cmd_lex_error;
+       __pdata uint8_t r = ao_cmd_lex_error;
 
        ao_cmd_lex_u32 = 0;
        ao_cmd_white();
@@ -218,20 +219,23 @@ version(void)
        printf("manufacturer     %s\n", ao_manufacturer);
        printf("product          %s\n", ao_product);
        printf("serial-number    %u\n", ao_serial_number);
+#if HAS_EEPROM
+       printf("log-format       %u\n", ao_log_format);
+#endif
        printf("software-version %s\n", ao_version);
 }
 
 #define NUM_CMDS       11
 
 static __code struct ao_cmds   *__xdata (ao_cmds[NUM_CMDS]);
-static __xdata uint8_t         ao_ncmds;
+static __pdata uint8_t         ao_ncmds;
 
 static void
 help(void)
 {
-       __xdata uint8_t cmds;
-       __xdata uint8_t cmd;
-       __code struct ao_cmds * __xdata cs;
+       register uint8_t cmds;
+       register uint8_t cmd;
+       register __code struct ao_cmds * cs;
 
        for (cmds = 0; cmds < ao_ncmds; cmds++) {
                cs = ao_cmds[cmds];
@@ -265,8 +269,8 @@ ao_cmd_register(__code struct ao_cmds *cmds)
 void
 ao_cmd(void)
 {
-       __xdata char    c;
-       __xdata uint8_t cmd, cmds;
+       char    c;
+       uint8_t cmd, cmds;
        __code struct ao_cmds * __xdata cs;
        void (*__xdata func)(void);