X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_serial.c;h=3f10376658cb10d02d627a9eed6c5b42be24b1c7;hp=f2f5e69736e6540f07572d90b9ba45a163337059;hb=e6d6ad66ce177eb6e49eaa04b1ecc6426f4bbdbf;hpb=a1da7e871aee75308bc05ce1b7a0dc402e4c9509

diff --git a/src/ao_serial.c b/src/ao_serial.c
index f2f5e697..3f103766 100644
--- a/src/ao_serial.c
+++ b/src/ao_serial.c
@@ -60,7 +60,10 @@ ao_serial_getchar(void) __critical
 		ao_sleep(&ao_usart1_rx_fifo);
 	ao_fifo_remove(ao_usart1_rx_fifo, c);
 	if (serial_echo) {
-		printf("%02x\n", (uint8_t) c);
+		printf("%02x ", ((int) c) & 0xff);
+		if (c >= ' ')
+			putchar(c);
+		putchar('\n');
 		flush();
 	}
 	return c;
@@ -76,13 +79,10 @@ ao_serial_putchar(char c) __critical
 }
 
 static void
-send_serial(void)
+ao_serial_drain(void) __critical
 {
-	ao_cmd_white();
-	while (ao_cmd_lex_c != '\n') {
-		ao_serial_putchar(ao_cmd_lex_c);
-		ao_cmd_lex();
-	}
+	while (!ao_fifo_empty(ao_usart1_tx_fifo))
+		ao_sleep(&ao_usart1_tx_fifo);
 }
 
 static void
@@ -93,9 +93,8 @@ monitor_serial(void)
 }
 
 __code struct ao_cmds ao_serial_cmds[] = {
-	{ 'S', send_serial,		"S <data>                           Send data to serial line" },
 	{ 'M', monitor_serial,		"M <enable>                         Monitor serial data" },
-	{ 0, send_serial, NULL },
+	{ 0, monitor_serial, NULL },
 };
 
 static const struct {
@@ -106,6 +105,10 @@ static const struct {
 		/* .baud = */ 163,
 		/* .gcr  = */ (7 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
 	},
+	/* [AO_SERIAL_SPEED_9600] = */ {
+		/* .baud = */ 163,
+		/* .gcr  = */ (8 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+	},
 	/* [AO_SERIAL_SPEED_57600] = */ {
 		/* .baud = */ 59,
 		/* .gcr =  */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
@@ -115,6 +118,9 @@ static const struct {
 void
 ao_serial_set_speed(uint8_t speed)
 {
+	ao_serial_drain();
+	if (speed > AO_SERIAL_SPEED_57600)
+		return;
 	U1BAUD = ao_serial_speeds[speed].baud;
 	U1GCR = ao_serial_speeds[speed].gcr;
 }