__pdata char ao_cmd_lex_c;
__pdata enum ao_cmd_status ao_cmd_status;
-#define CMD_LEN 32
+#define CMD_LEN 48
static __xdata char cmd_line[CMD_LEN];
static __pdata uint8_t cmd_len;
ao_cmd_lex();
}
+int8_t
+ao_cmd_hexchar(char c)
+{
+ if ('0' <= c && c <= '9')
+ return (c - '0');
+ if ('a' <= c && c <= 'f')
+ return (c - 'a' + 10);
+ if ('A' <= c && c <= 'F')
+ return (c - 'A' + 10);
+ return -1;
+}
+
+void
+ao_cmd_hexbyte(void)
+{
+ uint8_t i;
+ int8_t n;
+
+ ao_cmd_lex_i = 0;
+ ao_cmd_white();
+ for (i = 0; i < 2; i++) {
+ n = ao_cmd_hexchar(ao_cmd_lex_c);
+ if (n < 0) {
+ ao_cmd_status = ao_cmd_syntax_error;
+ break;
+ }
+ ao_cmd_lex_i = (ao_cmd_lex_i << 4) | n;
+ ao_cmd_lex();
+ }
+}
+
void
ao_cmd_hex(void)
{
__pdata uint8_t r = ao_cmd_lex_error;
- uint8_t n;
+ int8_t n;
ao_cmd_lex_i = 0;
ao_cmd_white();
for(;;) {
- if ('0' <= ao_cmd_lex_c && ao_cmd_lex_c <= '9')
- n = (ao_cmd_lex_c - '0');
- else if ('a' <= ao_cmd_lex_c && ao_cmd_lex_c <= 'f')
- n = (ao_cmd_lex_c - 'a' + 10);
- else if ('A' <= ao_cmd_lex_c && ao_cmd_lex_c <= 'F')
- n = (ao_cmd_lex_c - 'A' + 10);
- else
+ n = ao_cmd_hexchar(ao_cmd_lex_c);
+ if (n < 0)
break;
ao_cmd_lex_i = (ao_cmd_lex_i << 4) | n;
r = ao_cmd_success;
ao_cmd_white();
if (!ao_match_word("eboot"))
return;
+ /* Delay waiting for the packet master to be turned off
+ * so that we don't end up back in idle mode because we
+ * received a packet after boot.
+ */
+ flush();
+ ao_delay(AO_SEC_TO_TICKS(1));
ao_arch_reboot();
ao_panic(AO_PANIC_REBOOT);
}
printf("manufacturer %s\n", ao_manufacturer);
printf("product %s\n", ao_product);
printf("serial-number %u\n", ao_serial_number);
-#if HAS_EEPROM
+#if HAS_LOG
printf("log-format %u\n", ao_log_format);
#endif
printf("software-version %s\n", ao_version);
cs = ao_cmds[cmds];
for (cmd = 0; cs[cmd].func; cmd++)
printf("%-45s %s\n",
- cs[cmd].help,
- cs[cmd].help+1+strlen(cs[cmd].help));
+ cs[cmd].help,
+ cs[cmd].help+1+strlen(cs[cmd].help));
}
}