X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_cmd.c;h=fdc70007a36d414c14fe6883d5a07bcd83863041;hb=0dd9e1dd62656a931f9559af6da9131f704f83f9;hp=d0a4663352ff703718b0e4d27ab4834d42e2660d;hpb=8a1cbef0e316e38c80b71d3bac15641fe56e0a99;p=fw%2Faltos

diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index d0a46633..fdc70007 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -121,10 +121,16 @@ ao_cmd_put8(uint8_t v)
 	putnibble(v & 0xf);
 }
 
+uint8_t
+ao_cmd_is_white(void)
+{
+	return ao_cmd_lex_c == ' ' || ao_cmd_lex_c == '\t';
+}
+
 void
 ao_cmd_white(void)
 {
-	while (ao_cmd_lex_c == ' ' || ao_cmd_lex_c == '\t')
+	while (ao_cmd_is_white())
 		ao_cmd_lex();
 }
 
@@ -227,6 +233,12 @@ ao_reboot(void)
 	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);
 }
@@ -251,16 +263,16 @@ static __pdata uint8_t		ao_ncmds;
 static void
 help(void)
 {
-	register uint8_t cmds;
-	register uint8_t cmd;
-	register __code struct ao_cmds * cs;
+	__pdata uint8_t cmds;
+	__pdata uint8_t cmd;
+	__code struct ao_cmds * __pdata cs;
 
 	for (cmds = 0; cmds < ao_ncmds; cmds++) {
 		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));
 	}
 }
 
@@ -288,7 +300,7 @@ ao_cmd_register(__code struct ao_cmds *cmds)
 void
 ao_cmd(void)
 {
-	char	c;
+	__pdata char	c;
 	uint8_t cmd, cmds;
 	__code struct ao_cmds * __xdata cs;
 	void (*__xdata func)(void);
@@ -324,8 +336,8 @@ __xdata struct ao_task ao_cmd_task;
 
 __code struct ao_cmds	ao_base_cmds[] = {
 	{ help,		"?\0Help" },
-	{ ao_task_info,	"T\0Show tasks" },
-	{ echo,		"E <0 off, 1 on>\0Set echo mode" },
+	{ ao_task_info,	"T\0Tasks" },
+	{ echo,		"E <0 off, 1 on>\0Echo" },
 	{ ao_reboot,	"r eboot\0Reboot" },
 	{ version,	"v\0Version" },
 	{ 0,	NULL },