X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_cmd.c;h=c738a3e04ab741d4a8148c0bec60c61ae9506204;hp=81a527085faf5b099fa89f177d871b16a1c235ea;hb=a5d60fdb9c969c1516feb76a16001c9688112c4c;hpb=4114210e0b813f4af99d0cb7755ad2ac2c4b120e

diff --git a/src/ao_cmd.c b/src/ao_cmd.c
index 81a52708..c738a3e0 100644
--- a/src/ao_cmd.c
+++ b/src/ao_cmd.c
@@ -18,9 +18,9 @@
 #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;
-static __xdata uint8_t	lex_echo;
 
 #define CMD_LEN	32
 
@@ -40,7 +40,7 @@ static void
 readline(void)
 {
 	__xdata char c;
-	if (lex_echo)
+	if (ao_echo())
 		put_string("> ");
 	cmd_len = 0;
 	for (;;) {
@@ -49,7 +49,7 @@ readline(void)
 		/* backspace/delete */
 		if (c == '\010' || c == '\177') {
 			if (cmd_len != 0) {
-				if (lex_echo)
+				if (ao_echo())
 					put_string("\010 \010");
 				--cmd_len;
 			}
@@ -59,7 +59,7 @@ readline(void)
 		/* ^U */
 		if (c == '\025') {
 			while (cmd_len != 0) {
-				if (lex_echo)
+				if (ao_echo())
 					put_string("\010 \010");
 				--cmd_len;
 			}
@@ -71,18 +71,18 @@ readline(void)
 			c = '\n';
 
 		if (c == '\n') {
-			if (lex_echo)
+			if (ao_echo())
 				putchar('\n');
 			break;
 		}
 
 		if (cmd_len >= CMD_LEN - 2) {
-			if (lex_echo)
+			if (ao_echo())
 				putchar('\007');
 			continue;
 		}
 		cmd_line[cmd_len++] = c;
-		if (lex_echo)
+		if (ao_echo())
 			putchar(c);
 	}
 	cmd_line[cmd_len++] = '\n';
@@ -157,11 +157,11 @@ ao_cmd_decimal(void)
 {
 	__xdata uint8_t	r = ao_cmd_lex_error;
 
-	ao_cmd_lex_i = 0;
+	ao_cmd_lex_u32 = 0;
 	ao_cmd_white();
 	for(;;) {
 		if ('0' <= ao_cmd_lex_c && ao_cmd_lex_c <= '9')
-			ao_cmd_lex_i = (ao_cmd_lex_i * 10) + (ao_cmd_lex_c - '0');
+			ao_cmd_lex_u32 = (ao_cmd_lex_u32 * 10) + (ao_cmd_lex_c - '0');
 		else
 			break;
 		r = ao_cmd_success;
@@ -169,6 +169,7 @@ ao_cmd_decimal(void)
 	}
 	if (r != ao_cmd_success)
 		ao_cmd_status = r;
+	ao_cmd_lex_i = (uint16_t) ao_cmd_lex_u32;
 }
 
 uint8_t
@@ -196,7 +197,19 @@ static void
 echo(void)
 {
 	ao_cmd_hex();
-	lex_echo = ao_cmd_lex_i != 0;
+	if (ao_cmd_status == ao_cmd_success)
+		ao_stdios[ao_cur_stdio].echo = ao_cmd_lex_i != 0;
+}
+
+static void
+ao_reboot(void)
+{
+	ao_cmd_white();
+	if (!ao_match_word("eboot"))
+		return;
+	WDCTL = WDCTL_EN | WDCTL_MODE_WATCHDOG | WDCTL_INT_64;
+	ao_delay(AO_SEC_TO_TICKS(2));
+	ao_panic(AO_PANIC_REBOOT);
 }
 
 static void
@@ -224,8 +237,10 @@ help(void)
 	puts(help_txt);
 	for (cmds = 0; cmds < ao_ncmds; cmds++) {
 		cs = ao_cmds[cmds];
-		for (cmd = 0; cs[cmd].cmd != '\0'; cmd++)
-			puts(cs[cmd].help);
+		for (cmd = 0; cs[cmd].func; cmd++)
+			printf("%-45s %s\n",
+				cs[cmd].help,
+				cs[cmd].help+1+strlen(cs[cmd].help));
 	}
 }
 
@@ -250,17 +265,20 @@ ao_cmd_register(__code struct ao_cmds *cmds)
 }
 
 void
-ao_cmd(void *parameters)
+ao_cmd(void)
 {
 	__xdata char	c;
 	__xdata uint8_t cmd, cmds;
 	__code struct ao_cmds * __xdata cs;
 	void (*__xdata func)(void);
-	(void) parameters;
 
-	lex_echo = 1;
 	for (;;) {
 		readline();
+#if HAS_CMD_FILTER
+		if (ao_cmd_filter())
+			continue;
+		cmd_i = 0;
+#endif
 		ao_cmd_lex();
 		ao_cmd_white();
 		c = ao_cmd_lex_c;
@@ -270,8 +288,8 @@ ao_cmd(void *parameters)
 		func = (void (*)(void)) NULL;
 		for (cmds = 0; cmds < ao_ncmds; cmds++) {
 			cs = ao_cmds[cmds];
-			for (cmd = 0; cs[cmd].cmd != '\0'; cmd++)
-				if (cs[cmd].cmd == c) {
+			for (cmd = 0; cs[cmd].func; cmd++)
+				if (cs[cmd].help[0] == c) {
 					func = cs[cmd].func;
 					break;
 				}
@@ -289,11 +307,12 @@ ao_cmd(void *parameters)
 __xdata struct ao_task ao_cmd_task;
 
 __code struct ao_cmds	ao_base_cmds[] = {
-	{ '?', help,		"?                                  Print this message" },
-	{ 'T', ao_task_info,	"T                                  Show task states" },
-	{ 'E', echo,		"E <0 off, 1 on>                    Set command echo mode" },
-	{ 'v', version,		"v                                  Show version" },
-	{ 0,    help,	NULL },
+	{ help,		"?\0Print this message" },
+	{ ao_task_info,	"T\0Show task states" },
+	{ echo,		"E <0 off, 1 on>\0Set command echo mode" },
+	{ ao_reboot,	"r eboot\0Reboot" },
+	{ version,	"v\0Show version" },
+	{ 0,	NULL },
 };
 
 void