altos: Use USART configuration 1 with flow control for TBT

[fw/altos] / src / ao_btm.c

diff --git a/src/ao_btm.c b/src/ao_btm.c
index 784a566f81b14fce9e8cdd42713fe1ab56b253f6..db0ff6b09371508a67c806856e7ec21b4c2b27c3 100644 (file)
--- a/src/ao_btm.c
+++ b/src/ao_btm.c
@@ -17,46 +17,8 @@
 
 #include "ao.h"
 
-uint8_t                        ao_btm_running;
 int8_t                 ao_btm_stdio;
 __xdata uint8_t                ao_btm_connected;
-uint8_t                        ao_btm_chat;
-
-__xdata char           ao_btm_buffer[1024];
-int                    ao_btm_ptr;
-char                   ao_btm_dir;
-
-void
-ao_btm_putchar(char c);
-
-static void
-ao_btm_add_char(char c)
-{
-       if (ao_btm_ptr < sizeof (ao_btm_buffer))
-               ao_btm_buffer[ao_btm_ptr++] = c;
-}
-
-static void
-ao_btm_log_char(char c, char dir)
-{
-       if (dir != ao_btm_dir) {
-               ao_btm_add_char(dir);
-               ao_btm_dir = dir;
-       }
-       ao_btm_add_char(c);
-}
-
-static void
-ao_btm_log_out_char(char c)
-{
-       ao_btm_log_char(c, '>');
-}
-
-static void
-ao_btm_log_in_char(char c)
-{
-       ao_btm_log_char(c, '<');
-}
 
 #define AO_BTM_MAX_REPLY       16
 __xdata char           ao_btm_reply[AO_BTM_MAX_REPLY];
@@ -77,7 +39,6 @@ ao_btm_get_line(void)
        for (;;) {
 
                while ((c = ao_serial_pollchar()) != AO_READ_AGAIN) {
-                       ao_btm_log_in_char(c);
                        if (ao_btm_reply_len < sizeof (ao_btm_reply))
                                ao_btm_reply[ao_btm_reply_len++] = c;
                        if (c == '\r' || c == '\n')
@@ -117,55 +78,15 @@ ao_btm_echo(uint8_t echo)
 }
 
 /*
- * A command line pre-processor to detect connect/disconnect messages
- * and update the internal state
+ * Delay between command charaters; the BT module
+ * can't keep up with 57600 baud
  */
 
-uint8_t
-ao_cmd_filter(void)
-{
-       if (ao_cur_stdio != ao_btm_stdio)
-               return 0;
-       ao_cmd_lex();
-       while (ao_cmd_lex_c != '\n') {
-               if (ao_match_word("CONNECT"))
-                       return 1;
-               if (ao_match_word("DISCONNECT"))
-                       return 1;
-               if (ao_match_word("ERROR"))
-                       return 1;
-               if (ao_match_word("OK"))
-                       return 1;
-               ao_cmd_lex();
-       }
-       ao_cmd_status = 0;
-       return 0;
-}
-
-/*
- * A wrapper for ao_serial_pollchar that
- * doesn't return any characters while we're
- * initializing the bluetooth device
- */
-char
-ao_btm_pollchar(void)
-{
-       char    c;
-       if (!ao_btm_running)
-               return AO_READ_AGAIN;
-       c = ao_serial_pollchar();
-       if (c != AO_READ_AGAIN)
-               ao_btm_log_in_char(c);
-       return c;
-}
-
 void
 ao_btm_putchar(char c)
 {
-       ao_btm_log_out_char(c);
        ao_serial_putchar(c);
-       if (!ao_btm_running)
-               ao_delay(1);
+       ao_delay(1);
 }
 
 /*
@@ -270,30 +191,14 @@ ao_btm(void)
        /* Turn off status reporting */
        ao_btm_cmd("ATQ1\r");
 
-       ao_btm_stdio = ao_add_stdio(ao_btm_pollchar,
-                                   ao_btm_putchar,
+       ao_btm_stdio = ao_add_stdio(ao_serial_pollchar,
+                                   ao_serial_putchar,
                                    NULL);
        ao_btm_echo(0);
 
-       ao_btm_running = 1;
        for (;;) {
-               while (!ao_btm_connected && !ao_btm_chat)
+               while (!ao_btm_connected)
                        ao_sleep(&ao_btm_connected);
-               if (ao_btm_chat) {
-                       ao_btm_running = 0;
-                       while (ao_btm_chat) {
-                               char    c;
-                               c = ao_serial_pollchar();
-                               if (c != AO_READ_AGAIN) {
-                                       ao_btm_log_in_char(c);
-                                       ao_usb_putchar(c);
-                               } else {
-                                       ao_usb_flush();
-                                       ao_sleep(&ao_usart1_rx_fifo);
-                               }
-                       }
-                       ao_btm_running = 1;
-               }
                while (ao_btm_connected) {
                        ao_led_for(AO_LED_GREEN, AO_MS_TO_TICKS(20));
                        ao_delay(AO_SEC_TO_TICKS(3));
@@ -303,60 +208,6 @@ ao_btm(void)
 
 __xdata struct ao_task ao_btm_task;
 
-/*
- * Connect directly to the bluetooth device, mostly
- * useful for testing
- */
-static void
-ao_btm_forward(void)
-{
-       char c;
-
-       ao_btm_chat = 1;
-       ao_wakeup(&ao_btm_connected);
-       ao_usb_flush();
-       while ((c = ao_usb_getchar()) != '~') {
-               if (c == '\n') c = '\r';
-               ao_btm_putchar(c);
-       }
-       ao_btm_chat = 0;
-       while (!ao_btm_running) {
-               ao_wakeup(&ao_usart1_rx_fifo);
-               ao_delay(AO_MS_TO_TICKS(10));
-       }
-}
-
-/*
- * Dump everything received from the bluetooth device during startup
- */
-static void
-ao_btm_dump(void)
-{
-       int i;
-       char c;
-
-       for (i = 0; i < ao_btm_ptr; i++) {
-               c = ao_btm_buffer[i];
-               if (c < ' ' && c != '\n')
-                       printf("\\%03o", ((int) c) & 0xff);
-               else
-                       putchar(ao_btm_buffer[i]);
-       }
-       putchar('\n');
-}
-
-static void
-ao_btm_speed(void)
-{
-       ao_cmd_decimal();
-       if (ao_cmd_lex_u32 == 57600)
-               ao_serial_set_speed(AO_SERIAL_SPEED_57600);
-       else if (ao_cmd_lex_u32 == 19200)
-               ao_serial_set_speed(AO_SERIAL_SPEED_19200);
-       else
-               ao_cmd_status = ao_cmd_syntax_error;
-}
-
 void
 ao_btm_check_link() __critical
 {
@@ -379,13 +230,6 @@ ao_btm_isr(void)
        P2IFG = 0;
 }
 
-__code struct ao_cmds ao_btm_cmds[] = {
-       { ao_btm_forward,       "B\0BTM serial link." },
-       { ao_btm_dump,          "d\0Dump btm buffer." },
-       { ao_btm_speed,         "s <19200,57600>\0Set btm serial speed." },
-       { 0, NULL },
-};
-
 void
 ao_btm_init (void)
 {
@@ -406,5 +250,4 @@ ao_btm_init (void)
        PICTL |= PICTL_P2IEN;
 
        ao_add_task(&ao_btm_task, ao_btm, "bt");
-       ao_cmd_register(&ao_btm_cmds[0]);
 }