doc: Add 1.9.22 release notes

[fw/altos] / src / drivers / ao_rn4678.c

diff --git a/src/drivers/ao_rn4678.c b/src/drivers/ao_rn4678.c
index 4ace4b78595c1a4a00743675fbe459cf670b6aa9..f3c05e82469e25a8fb186459fb8780592260f93e 100644 (file)
--- a/src/drivers/ao_rn4678.c
+++ b/src/drivers/ao_rn4678.c
@@ -108,7 +108,7 @@ static const char *status_strings[] = {
 #define NUM_STATUS_STRING      (sizeof status_strings/sizeof status_strings[0])
 
 static char            ao_rn_buffer[64];
-static int             ao_rn_buf_cnt, ao_rn_buf_ptr;
+static size_t          ao_rn_buf_cnt, ao_rn_buf_ptr;
 static int             ao_rn_draining;
 static AO_TICK_TYPE    ao_rn_buf_time;
 
@@ -116,7 +116,7 @@ static AO_TICK_TYPE ao_rn_buf_time;
  * disabled due to a firmware bug. So, this code finds those in the
  * input and strips them out.
  */
-int
+static int
 _ao_wrap_rn_pollchar(void)
 {
        int             c = AO_READ_AGAIN;
@@ -146,9 +146,9 @@ _ao_wrap_rn_pollchar(void)
                                /* If we filled the buffer, just give up */
                                ao_rn_draining = 1;
                        } else {
-                               ao_rn_buffer[ao_rn_buf_cnt++] = c;
+                               ao_rn_buffer[ao_rn_buf_cnt++] = (char) c;
                                for (i = 0; i < NUM_STATUS_STRING; i++) {
-                                       int cmp = strlen(status_strings[i]);
+                                       size_t cmp = strlen(status_strings[i]);
                                        if (cmp >= ao_rn_buf_cnt)
                                                cmp = ao_rn_buf_cnt-1;
                                        if (memcmp(ao_rn_buffer+1, status_strings[i], cmp) == 0)
@@ -158,7 +158,7 @@ _ao_wrap_rn_pollchar(void)
                                        ao_rn_draining = 1;
                        }
                } else if (c == STATUS_CHAR) {
-                       ao_rn_buffer[0] = c;
+                       ao_rn_buffer[0] = (char) c;
                        ao_rn_buf_cnt = 1;
                        ao_rn_buf_ptr = 0;
                        ao_rn_buf_time = ao_time();
@@ -227,17 +227,17 @@ ao_rn_wait_char(AO_TICK_TYPE giveup_time)
                        ao_arch_release_interrupts();
                        return AO_READ_AGAIN;
                }
-               _ao_serial_rn_sleep_for(delay);
+               _ao_serial_rn_sleep_for((AO_TICK_TYPE) delay);
        }
        ao_arch_release_interrupts();
        return c;
 }
 
 static int
-ao_rn_wait_for(int timeout, char *match)
+ao_rn_wait_for(AO_TICK_TYPE timeout, char *match)
 {
        char            reply[AO_RN_MAX_REPLY_LEN + 1];
-       int             match_len = strlen(match);
+       size_t          match_len = strlen(match);
        AO_TICK_TYPE    giveup_time = ao_time() + timeout;
        int             c;
 
@@ -308,19 +308,10 @@ ao_rn_wait_status(void)
 }
 
 static int
-ao_rn_set_name(void)
+ao_rn_set_name(char *name)
 {
-       char    sn[8];
-       char    *s = sn + 8;
-       int     n;
-
 //     ao_rn_dbg("set name...\n");
-       *--s = '\0';
-       n = ao_serial_number;
-       do {
-               *--s = '0' + n % 10;
-       } while (n /= 10);
-       ao_rn_send_cmd(AO_RN_SET_NAME_CMD "TeleBT-", s);
+       ao_rn_send_cmd(AO_RN_SET_NAME_CMD, name);
        return ao_rn_wait_status();
 }
 
@@ -345,16 +336,16 @@ ao_rn_isr(void)
        ao_wakeup(&ao_rn_connected);
 }
 
+#ifndef ao_bt_panic
 static void
 ao_bt_panic(int where)
 {
        int i;
        for (;;) {
-               for (i = 0; i < 50; i++) {
-                       ao_led_toggle(AO_BT_LED);
+               for (i = 0; i < 25; i++) {
+                       ao_led_for(AO_BT_LED, AO_MS_TO_TICKS(10));
                        ao_delay(AO_MS_TO_TICKS(10));
                }
-               ao_led_off(AO_BT_LED);
                ao_delay(AO_MS_TO_TICKS(500));
                for (i = 0; i < where; i++) {
                        ao_led_for(AO_BT_LED, AO_MS_TO_TICKS(200));
@@ -362,13 +353,14 @@ ao_bt_panic(int where)
                }
        }
 }
+#endif
 
 static uint8_t ao_rn_stdio;
 
 /*
  * Set the stdio echo for the bluetooth link
  */
-void
+static void
 ao_rn_echo(uint8_t echo)
 {
        ao_stdios[ao_rn_stdio].echo = echo;
@@ -378,7 +370,7 @@ static void
 ao_rn(void)
 {
        int     status = AO_RN_ERROR;
-       char    name[17];
+       char    have_name[17], want_name[17];
        int     i;
 
        ao_rn_dbg("ao_rn top\n");
@@ -417,15 +409,16 @@ ao_rn(void)
                /* Check to see if the name is already set and assume
                 * that the device is ready to go
                 */
-               status = ao_rn_get_name(name, sizeof (name));
+               status = ao_rn_get_name(have_name, sizeof (have_name));
                if (status != AO_RN_OK) {
                        ao_rn_dbg("get name failed\n");
-                       status = ao_rn_get_name(name, sizeof (name));
+                       status = ao_rn_get_name(have_name, sizeof (have_name));
                        if (status != AO_RN_OK)
                                continue;
                }
+               snprintf(want_name, sizeof(want_name), "TeleBT-%u", ao_serial_number);
 
-               if (strncmp(name, "TeleBT-", 7) == 0) {
+               if (strcmp(have_name, want_name) == 0) {
                        ao_rn_dbg("name is set\n");
                        status = AO_RN_OK;
                        break;
@@ -454,7 +447,7 @@ ao_rn(void)
                /* Finally, set the name. Doing this last makes it possible to check
                 * if the whole sequence has been done
                 */
-               if (ao_rn_set_name() != AO_RN_OK) {
+               if (ao_rn_set_name(want_name) != AO_RN_OK) {
                        ao_rn_dbg("set name failed\n");
                        continue;
                }
@@ -522,7 +515,7 @@ static void
 ao_rn_factory(void)
 {
        int     i;
-       int     v = 0;
+       uint8_t v = 0;
 
        /*
         * Factory reset. Flip pin P3_1 5 times within the first five
@@ -548,7 +541,10 @@ ao_rn_factory(void)
                v = 1-v;
                ao_delay(AO_MS_TO_TICKS(50));
                ao_gpio_set(AO_RN_P3_1_PORT, AO_RN_P3_1_PIN, v);
-               ao_led_toggle(AO_BT_LED);
+               if (v)
+                       ao_led_on(AO_BT_LED);
+               else
+                       ao_led_off(AO_BT_LED);
        }
 
        /* And let P3_1 float again */