altos: Clean up usage of serial port for stdio

[fw/altos] / src / ao_serial.c

diff --git a/src/ao_serial.c b/src/ao_serial.c
index b8e9d2bf3a3db377a91e70e4e679d13546cba121..dc68f8621f5fa4f5ad542dadcffe0e1a9eabdd84 100644 (file)
--- a/src/ao_serial.c
+++ b/src/ao_serial.c
@@ -20,10 +20,6 @@
 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
 {
@@ -31,8 +27,7 @@ ao_serial_rx1_isr(void) __interrupt 3
                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);
+       ao_wakeup(&ao_stdin_ready);
 #endif
 }
 
@@ -58,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
 {
@@ -67,13 +60,6 @@ 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;
 }
 
@@ -82,22 +68,11 @@ 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
@@ -109,25 +84,13 @@ 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 {
        uint8_t baud;
        uint8_t gcr;
@@ -189,13 +152,4 @@ 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
 }