X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_serial.c;h=82370c6426acaa8a349224c56aae3d1cfb82e7cd;hp=dd383fca18ff141a5ffd7c0af0f923f746437eca;hb=82e04a0e3a3296288a524ec582785a36fd644331;hpb=8cdf4fb051c22b35c251d90bc288551f7c2898bf

diff --git a/src/ao_serial.c b/src/ao_serial.c
index dd383fca..82370c64 100644
--- a/src/ao_serial.c
+++ b/src/ao_serial.c
@@ -26,6 +26,9 @@ 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
+	ao_wakeup(&ao_stdin_ready);
+#endif
 }
 
 static __xdata uint8_t ao_serial_tx1_started;
@@ -50,8 +53,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 +60,21 @@ 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 (ao_fifo_empty(ao_usart1_rx_fifo))
+		return AO_READ_AGAIN;
+	ao_fifo_remove(ao_usart1_rx_fifo,c);
+	return c;
+}
+#endif
+
 void
 ao_serial_putchar(char c) __critical
 {
@@ -78,26 +84,14 @@ ao_serial_putchar(char c) __critical
 	ao_serial_tx1_start();
 }
 
-static void
+void
 ao_serial_drain(void) __critical
 {
 	while (!ao_fifo_empty(ao_usart1_tx_fifo))
 		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[] = {
-	{ monitor_serial,		"M <enable>\0Monitor serial data" },
-	{ 0, NULL },
-};
-
-static const struct {
+static __code struct {
 	uint8_t	baud;
 	uint8_t	gcr;
 } ao_serial_speeds[] = {
@@ -109,6 +103,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
@@ -121,6 +119,7 @@ ao_serial_set_speed(uint8_t speed)
 	ao_serial_drain();
 	if (speed > AO_SERIAL_SPEED_57600)
 		return;
+	U1UCR |= UxUCR_FLUSH;
 	U1BAUD = ao_serial_speeds[speed].baud;
 	U1GCR = ao_serial_speeds[speed].gcr;
 }
@@ -128,13 +127,28 @@ ao_serial_set_speed(uint8_t speed)
 void
 ao_serial_init(void)
 {
+#if HAS_SERIAL_1_ALT_1
+	/* Set up the USART pin assignment */
+	PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_1;
+
+	P2DIR = (P2DIR & ~P2DIR_PRIP0_MASK) | P2DIR_PRIP0_USART1_USART0;
+
+	/* Make the USART pins be controlled by the USART */
+	P0SEL |= (1 << 5) | (1 << 4);
+#if HAS_SERIAL_1_HW_FLOW
+	P0SEL |= (1 << 3) | (1 << 2);
+#endif
+#else
 	/* Set up the USART pin assignment */
 	PERCFG = (PERCFG & ~PERCFG_U1CFG_ALT_MASK) | PERCFG_U1CFG_ALT_2;
 
-	/* ee has already set the P2SEL bits */
+	P2SEL = (P2SEL & ~(P2SEL_PRI3P1_MASK | P2SEL_PRI2P1_MASK)) |
+		(P2SEL_PRI3P1_USART1 | P2SEL_PRI2P1_USART1);
 
 	/* Make the USART pins be controlled by the USART */
 	P1SEL |= (1 << 6) | (1 << 7);
+	P1SEL |= (1 << 5) | (1 << 4);
+#endif
 
 	/* UART mode with receiver enabled */
 	U1CSR = (UxCSR_MODE_UART | UxCSR_RE);
@@ -144,8 +158,12 @@ ao_serial_init(void)
 
 	/* Reasonable serial parameters */
 	U1UCR = (UxUCR_FLUSH |
+#if HAS_SERIAL_1_HW_FLOW
+		 UxUCR_FLOW_ENABLE |
+#else
 		 UxUCR_FLOW_DISABLE |
-		 UxUCR_D9_ODD_PARITY |
+#endif
+		 UxUCR_D9_EVEN_PARITY |
 		 UxUCR_BIT9_8_BITS |
 		 UxUCR_PARITY_DISABLE |
 		 UxUCR_SPB_1_STOP_BIT |
@@ -154,6 +172,4 @@ ao_serial_init(void)
 
 	IEN0 |= IEN0_URX1IE;
 	IEN2 |= IEN2_UTX1IE;
-
-	ao_cmd_register(&ao_serial_cmds[0]);
 }