X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_cmd.c;h=4ebaa6079368ec80164a8176d8d010914552cc9d;hp=14cb7569b5df9b0e9840afc8d494cccd5f1386ba;hb=56911f27376b0fe91a464e369bb8aa1531b3c7dc;hpb=2ba946fea29ff134ffaeaea9d7932f4bd4e953aa

diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 14cb7569..4ebaa607 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -16,6 +16,7 @@
  */
 
 #include "ao.h"
+#include "ao_task.h"
 
 __pdata uint16_t ao_cmd_lex_i;
 __pdata uint32_t ao_cmd_lex_u32;
@@ -28,20 +29,26 @@ static __xdata char	cmd_line[CMD_LEN];
 static __pdata uint8_t	cmd_len;
 static __pdata uint8_t	cmd_i;
 
-static void
-put_string(__code char *s)
+void
+ao_put_string(__code char *s)
 {
 	char	c;
 	while ((c = *s++))
 		putchar(c);
 }
 
+static void
+backspace(void)
+{
+	ao_put_string ("\010 \010");
+}
+
 static void
 readline(void)
 {
-	__pdata char c;
+	char c;
 	if (ao_echo())
-		put_string("> ");
+		ao_put_string("> ");
 	cmd_len = 0;
 	for (;;) {
 		flush();
@@ -50,7 +57,7 @@ readline(void)
 		if (c == '\010' || c == '\177') {
 			if (cmd_len != 0) {
 				if (ao_echo())
-					put_string("\010 \010");
+					backspace();
 				--cmd_len;
 			}
 			continue;
@@ -60,7 +67,7 @@ readline(void)
 		if (c == '\025') {
 			while (cmd_len != 0) {
 				if (ao_echo())
-					put_string("\010 \010");
+					backspace();
 				--cmd_len;
 			}
 			continue;
@@ -76,11 +83,8 @@ readline(void)
 			break;
 		}
 
-		if (cmd_len >= CMD_LEN - 2) {
-			if (ao_echo())
-				putchar('\007');
+		if (cmd_len >= CMD_LEN - 2)
 			continue;
-		}
 		cmd_line[cmd_len++] = c;
 		if (ao_echo())
 			putchar(c);
@@ -107,6 +111,22 @@ putnibble(uint8_t v)
 		putchar(v + ('a' - 10));
 }
 
+uint8_t
+ao_getnibble(void)
+{
+	char	c;
+
+	c = getchar();
+	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);
+	ao_cmd_status = ao_cmd_lex_error;
+	return 0;
+}
+
 void
 ao_cmd_put16(uint16_t v)
 {
@@ -186,9 +206,9 @@ ao_cmd_hex(void)
 }
 
 void
-ao_cmd_decimal(void)
+ao_cmd_decimal(void) __reentrant
 {
-	__pdata uint8_t	r = ao_cmd_lex_error;
+	uint8_t	r = ao_cmd_lex_error;
 
 	ao_cmd_lex_u32 = 0;
 	ao_cmd_white();
@@ -243,19 +263,40 @@ ao_reboot(void)
 	ao_panic(AO_PANIC_REBOOT);
 }
 
+#ifndef HAS_VERSION
+#define HAS_VERSION 1
+#endif
+
+#if HAS_VERSION
 static void
 version(void)
 {
-	printf("manufacturer     %s\n", ao_manufacturer);
-	printf("product          %s\n", ao_product);
-	printf("serial-number    %u\n", ao_serial_number);
+	printf("manufacturer     %s\n"
+	       "product          %s\n"
+	       "serial-number    %u\n"
+#if HAS_FLIGHT
+	       "current-flight   %u\n"
+#endif
 #if HAS_LOG
-	printf("log-format       %u\n", ao_log_format);
+	       "log-format       %u\n"
+#endif
+	       , ao_manufacturer
+	       , ao_product
+	       , ao_serial_number
+#if HAS_FLIGHT
+	       , ao_flight_number
 #endif
+#if HAS_LOG
+	       , ao_log_format
+#endif
+		);
 	printf("software-version %s\n", ao_version);
 }
+#endif
 
+#ifndef NUM_CMDS
 #define NUM_CMDS	11
+#endif
 
 static __code struct ao_cmds	*__xdata (ao_cmds[NUM_CMDS]);
 static __pdata uint8_t		ao_ncmds;
@@ -263,16 +304,25 @@ 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;
+	__code const char *h;
+	uint8_t e;
 
 	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));
+		for (cmd = 0; cs[cmd].func; cmd++) {
+			h = cs[cmd].help;
+			ao_put_string(h);
+			e = strlen(h);
+			h += e + 1;
+			e = 45 - e;
+			while (e--)
+				putchar(' ');
+			ao_put_string(h);
+			putchar('\n');
+		}
 	}
 }
 
@@ -300,7 +350,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);
@@ -332,14 +382,33 @@ ao_cmd(void)
 	}
 }
 
+#if HAS_BOOT_LOADER
+
+#include <ao_boot.h>
+
+static void
+ao_loader(void)
+{
+	flush();
+	ao_boot_loader();
+}
+#endif
+
 __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" },
+#if HAS_TASK_INFO
+	{ ao_task_info,	"T\0Tasks" },
+#endif
+	{ echo,		"E <0 off, 1 on>\0Echo" },
 	{ ao_reboot,	"r eboot\0Reboot" },
+#if HAS_VERSION
 	{ version,	"v\0Version" },
+#endif
+#if HAS_BOOT_LOADER
+	{ ao_loader,	"X\0Switch to boot loader" },
+#endif
 	{ 0,	NULL },
 };