X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_btm.c;h=3b6028a030f49abc5ef9cae9133b6bdc72659ae2;hp=5eb788156ad4f893e025a95d4b583e56b76bef41;hb=b4eba3f3a58a9c35e3699ff14405b997c1318d91;hpb=9b9568a637ffdbc67225271005f2b996ee08a0df

diff --git a/src/drivers/ao_btm.c b/src/drivers/ao_btm.c
index 5eb78815..3b6028a0 100644
--- a/src/drivers/ao_btm.c
+++ b/src/drivers/ao_btm.c
@@ -17,6 +17,14 @@
 
 #include "ao.h"
 
+#ifndef ao_serial_btm_getchar
+#define ao_serial_btm_putchar	ao_serial1_putchar
+#define _ao_serial_btm_pollchar	_ao_serial1_pollchar
+#define ao_serial_btm_set_speed ao_serial1_set_speed
+#define ao_serial_btm_drain	ao_serial1_drain
+#define ao_serial_btm_rx_fifo	ao_serial1_rx_fifo
+#endif
+
 int8_t			ao_btm_stdio;
 __xdata uint8_t		ao_btm_connected;
 
@@ -80,9 +88,9 @@ ao_btm_speed(void)
 {
 	ao_cmd_decimal();
 	if (ao_cmd_lex_u32 == 57600)
-		ao_serial_set_speed(AO_SERIAL_SPEED_57600);
+		ao_serial_btm_set_speed(AO_SERIAL_SPEED_57600);
 	else if (ao_cmd_lex_u32 == 19200)
-		ao_serial_set_speed(AO_SERIAL_SPEED_19200);
+		ao_serial_btm_set_speed(AO_SERIAL_SPEED_19200);
 	else
 		ao_cmd_status = ao_cmd_syntax_error;
 }
@@ -104,7 +112,29 @@ __code struct ao_cmds ao_btm_cmds[] = {
 #define AO_BTM_MAX_REPLY	16
 __xdata char		ao_btm_reply[AO_BTM_MAX_REPLY];
 
-extern volatile __xdata struct ao_fifo	ao_usart1_rx_fifo;
+/*
+ * Read one bluetooth character.
+ * Returns AO_READ_AGAIN if no character arrives within 10ms
+ */
+
+static int
+ao_btm_getchar(void)
+{
+	int	c;
+
+	ao_arch_block_interrupts();
+	while ((c = _ao_serial_btm_pollchar()) == AO_READ_AGAIN) {
+		ao_alarm(AO_MS_TO_TICKS(10));
+		c = ao_sleep(&ao_serial_btm_rx_fifo);
+		ao_clear_alarm();
+		if (c) {
+			c = AO_READ_AGAIN;
+			break;
+		}
+	}
+	ao_arch_release_interrupts();
+	return c;
+}
 
 /*
  * Read a line of data from the serial port, truncating
@@ -115,26 +145,15 @@ uint8_t
 ao_btm_get_line(void)
 {
 	uint8_t ao_btm_reply_len = 0;
-	char c;
-
-	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')
-				goto done;
-		}
-		for (c = 0; c < 10; c++) {
-			ao_delay(AO_MS_TO_TICKS(10));
-			if (!ao_fifo_empty(ao_usart1_rx_fifo))
-				break;
-		}
-		if (c == 10)
-			goto done;
+	int c;
+
+	while ((c = ao_btm_getchar()) != 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')
+			break;
 	}
-done:
 	for (c = ao_btm_reply_len; c < sizeof (ao_btm_reply);)
 		ao_btm_reply[c++] = '\0';
 	return ao_btm_reply_len;
@@ -168,7 +187,7 @@ void
 ao_btm_putchar(char c)
 {
 	ao_btm_log_out_char(c);
-	ao_serial_putchar(c);
+	ao_serial_btm_putchar(c);
 	ao_delay(1);
 }
 
@@ -229,8 +248,8 @@ ao_btm_set_name(void)
 uint8_t
 ao_btm_try_speed(uint8_t speed)
 {
-	ao_serial_set_speed(speed);
-	ao_btm_drain();
+	ao_serial_btm_set_speed(speed);
+	ao_serial_btm_drain();
 	(void) ao_btm_cmd("\rATE0\rATQ0\r");
 	if (ao_btm_cmd("AT\r") == 1)
 		return 1;
@@ -274,8 +293,8 @@ ao_btm(void)
 	/* Turn off status reporting */
 	ao_btm_cmd("ATQ1\r");
 
-	ao_btm_stdio = ao_add_stdio(ao_serial_pollchar,
-				    ao_serial_putchar,
+	ao_btm_stdio = ao_add_stdio(_ao_serial_btm_pollchar,
+				    ao_serial_btm_putchar,
 				    NULL);
 	ao_btm_echo(0);
 
@@ -283,7 +302,7 @@ ao_btm(void)
 		while (!ao_btm_connected)
 			ao_sleep(&ao_btm_connected);
 		while (ao_btm_connected) {
-			ao_led_for(AO_LED_GREEN, AO_MS_TO_TICKS(20));
+			ao_led_for(AO_BT_LED, AO_MS_TO_TICKS(20));
 			ao_delay(AO_SEC_TO_TICKS(3));
 		}
 	}
@@ -307,18 +326,20 @@ __xdata struct ao_task ao_btm_task;
 #endif
 
 void
-ao_btm_check_link() __critical
+ao_btm_check_link()
 {
-	/* Check the pin and configure the interrupt detector to wait for the
-	 * pin to flip the other way
-	 */
-	if (BT_LINK_PIN) {
-		ao_btm_connected = 0;
-		PICTL |= BT_PICTL_ICON;
-	} else {
-		ao_btm_connected = 1;
-		PICTL &= ~BT_PICTL_ICON;
-	}
+	ao_arch_critical(
+		/* Check the pin and configure the interrupt detector to wait for the
+		 * pin to flip the other way
+		 */
+		if (BT_LINK_PIN) {
+			ao_btm_connected = 0;
+			PICTL |= BT_PICTL_ICON;
+		} else {
+			ao_btm_connected = 1;
+			PICTL &= ~BT_PICTL_ICON;
+		}
+		);
 }
 
 void
@@ -341,7 +362,8 @@ void
 ao_btm_init (void)
 {
 	ao_serial_init();
-	ao_serial_set_speed(AO_SERIAL_SPEED_19200);
+
+	ao_serial_btm_set_speed(AO_SERIAL_SPEED_19200);
 
 #if BT_LINK_ON_P1
 	/*