X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fao_serial.c;h=d6395810064fced74a96432caa33d25481f9e9cc;hb=4f243a282f9aeb7433ccb2942850d380a091e603;hp=a48734c2f22793a957fb9575f6f5d0d2e0d21c26;hpb=ddc83b4c401be965a9947782becf20cc8c54e6a2;p=fw%2Faltos

diff --git a/src/ao_serial.c b/src/ao_serial.c
index a48734c2..d6395810 100644
--- a/src/ao_serial.c
+++ b/src/ao_serial.c
@@ -20,12 +20,20 @@
 volatile __xdata struct ao_fifo	ao_usart1_rx_fifo;
 volatile __xdata struct ao_fifo	ao_usart1_tx_fifo;
 
+#if USE_SERIAL_STDIN
+__pdata uint8_t	ao_serial_stdin;
+#endif
+
 void
 ao_serial_rx1_isr(void) __interrupt 3
 {
 	if (!ao_fifo_full(ao_usart1_rx_fifo))
 		ao_fifo_insert(ao_usart1_rx_fifo, U1DBUF);
 	ao_wakeup(&ao_usart1_rx_fifo);
+#if USE_SERIAL_STDIN
+	if (ao_serial_stdin)
+		ao_wakeup(&ao_stdin_ready);
+#endif
 }
 
 static __xdata uint8_t ao_serial_tx1_started;
@@ -50,8 +58,6 @@ ao_serial_tx1_isr(void) __interrupt 14
 	ao_wakeup(&ao_usart1_tx_fifo);
 }
 
-static __pdata serial_echo;
-
 char
 ao_serial_getchar(void) __critical
 {
@@ -59,16 +65,32 @@ ao_serial_getchar(void) __critical
 	while (ao_fifo_empty(ao_usart1_rx_fifo))
 		ao_sleep(&ao_usart1_rx_fifo);
 	ao_fifo_remove(ao_usart1_rx_fifo, c);
-	if (serial_echo) {
-		printf("%02x ", ((int) c) & 0xff);
-		if (c >= ' ')
-			putchar(c);
-		putchar('\n');
-		flush();
-	}
+	return c;
+}
+
+#if USE_SERIAL_STDIN
+char
+ao_serial_pollchar(void) __critical
+{
+	char	c;
+#if 0
+	if (!ao_serial_stdin)
+		return AO_READ_AGAIN;
+#endif
+	if (ao_fifo_empty(ao_usart1_rx_fifo))
+		return AO_READ_AGAIN;
+	ao_fifo_remove(ao_usart1_rx_fifo,c);
 	return c;
 }
 
+void
+ao_serial_set_stdin(uint8_t stdin)
+{
+	ao_serial_stdin = stdin;
+}
+
+#endif
+
 void
 ao_serial_putchar(char c) __critical
 {
@@ -85,18 +107,6 @@ ao_serial_drain(void) __critical
 		ao_sleep(&ao_usart1_tx_fifo);
 }
 
-static void
-monitor_serial(void)
-{
-	ao_cmd_hex();
-	serial_echo = ao_cmd_lex_i != 0;
-}
-
-__code struct ao_cmds ao_serial_cmds[] = {
-	{ 'M', monitor_serial,		"M <enable>                         Monitor serial data" },
-	{ 0, monitor_serial, NULL },
-};
-
 static const struct {
 	uint8_t	baud;
 	uint8_t	gcr;
@@ -109,6 +119,10 @@ static const struct {
 		/* .baud = */ 163,
 		/* .gcr  = */ (8 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
 	},
+	/* [AO_SERIAL_SPEED_19200] = */ {
+		/* .baud = */ 163,
+		/* .gcr  = */ (9 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
+	},
 	/* [AO_SERIAL_SPEED_57600] = */ {
 		/* .baud = */ 59,
 		/* .gcr =  */ (11 << UxGCR_BAUD_E_SHIFT) | UxGCR_ORDER_LSB
@@ -154,6 +168,11 @@ ao_serial_init(void)
 
 	IEN0 |= IEN0_URX1IE;
 	IEN2 |= IEN2_UTX1IE;
-
-	ao_cmd_register(&ao_serial_cmds[0]);
+#if 0
+#if USE_SERIAL_STDIN
+	ao_add_stdio(ao_serial_pollchar,
+		     ao_serial_putchar,
+		     NULL);
+#endif
+#endif
 }