X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=libaltos%2Flibaltos_common.c;h=fb8c314e3ae1b5f233d605090bbed39147f8a8e2;hp=f577de022a16b2de0413c32bde610cf35e6c0083;hb=45f7b91ea126f8f9e607a8ee53df655d992590f2;hpb=2536640b852feff41975d2da50befdda91ee6303

diff --git a/libaltos/libaltos_common.c b/libaltos/libaltos_common.c
index f577de02..fb8c314e 100644
--- a/libaltos/libaltos_common.c
+++ b/libaltos/libaltos_common.c
@@ -49,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
@@ -76,30 +81,48 @@ altos_putchar(struct altos_file *file, char c)
 }
 
 struct bt_vendor_map {
-	char	vendor[10];
-	int	port;
+	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 */
+	{ .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;
-	for (i = 0; i < NUM_BT_VENDOR_MAP; i++)
-		if (strncmp (device->addr, altos_bt_vendor_map[i].vendor, strlen(altos_bt_vendor_map[i].vendor)) == 0)
-			return altos_bt_vendor_map[i].port;
+	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);
 }