libaltos: Create altos_pause_one_second API

[fw/altos] / libaltos / libaltos_common.c

diff --git a/libaltos/libaltos_common.c b/libaltos/libaltos_common.c
index 090f03adbbff3cc3c07b42508bfc0cc2044384fc..fb8c314e3ae1b5f233d605090bbed39147f8a8e2 100644 (file)
--- a/libaltos/libaltos_common.c
+++ b/libaltos/libaltos_common.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -48,12 +49,17 @@ PUBLIC int
 altos_getchar(struct altos_file *file, int timeout)
 {
        int     ret;
+
+       file->busy = 1;
        while (file->in_read == file->in_used) {
                ret = altos_fill(file, timeout);
                if (ret)
-                       return ret;
+                       goto done;
        }
-       return file->in_data[file->in_read++];
+       ret = file->in_data[file->in_read++];
+done:
+       file->busy = 0;
+       return ret;
 }
 
 PUBLIC int
@@ -74,10 +80,49 @@ altos_putchar(struct altos_file *file, char c)
        return ret;
 }
 
+struct bt_vendor_map {
+       const char      vendor[10];
+       int             port;
+};
+
+static const struct bt_vendor_map altos_bt_vendor_map[] = {
+       { .vendor = "00:12:6f:", 1 },   /* Rayson */
+       { .vendor = "8c:de:52:", 6 },   /* ISSC */
+       { .vendor = "d8:80:39:", 6 },   /* Microchip */
+};
+
+#define NUM_BT_VENDOR_MAP      (sizeof altos_bt_vendor_map / sizeof altos_bt_vendor_map[0])
+#define BT_PORT_DEFAULT                1
+
+static inline int
+ao_tolower(int c) {
+       if ('A' <= c && c <= 'Z')
+               return c + 'a' - 'A';
+       return c;
+}
+
+int altos_bt_port(struct altos_bt_device *device) {
+       unsigned i, j;
+       for (i = 0; i < NUM_BT_VENDOR_MAP; i++) {
+               const char *vendor = altos_bt_vendor_map[i].vendor;
+               for (j = 0; ; j++) {
+                       if (vendor[j] == '\0')
+                               return altos_bt_vendor_map[i].port;
+                       if (device->addr[j] == '\0')
+                               break;
+                       if (ao_tolower(device->addr[j]) != vendor[j])
+                               break;
+               }
+       }
+       return BT_PORT_DEFAULT;
+}
 
 PUBLIC void
 altos_free(struct altos_file *file)
 {
+       int i;
        altos_close(file);
+       for (i = 0; i < 10 && file->busy; i++)
+               altos_pause_one_second();
        free(file);
 }