From: Keith Packard <keithp@keithp.com>
Date: Mon, 30 Aug 2010 00:33:59 +0000 (-0700)
Subject: libaltos: AltusMetrum devices use more than one USB ID.
X-Git-Tag: debian/0.7+22+g4790f78~22
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=edcfb1bdf64772d3b83405ccf99385b8fea5d8e4

libaltos: AltusMetrum devices use more than one USB ID.

List all usb devices, picking those with AltusMetrum IDs.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/ao-tools/libaltos/libaltos.c b/ao-tools/libaltos/libaltos.c
index ffdb2366..93c483d1 100644
--- a/ao-tools/libaltos/libaltos.c
+++ b/ao-tools/libaltos/libaltos.c
@@ -391,24 +391,40 @@ get_string(io_object_t object, CFStringRef entry, char *result, int result_len)
 	return 0;
 }
 
+static int
+get_number(io_object_t object, CFStringRef entry, int *result)
+{
+	CFTypeRef entry_as_number;
+	Boolean got_number;
+	
+	entry_as_number = IORegistryEntrySearchCFProperty (object,
+							   kIOServicePlane,
+							   entry,
+							   kCFAllocatorDefault,
+							   kIORegistryIterateRecursively);
+	if (entry_as_number) {
+		got_number = CFNumberGetValue(entry_as_number,
+					      kCFNumberIntType,
+					      result);
+		if (got_number)
+			return 1;
+	}
+	return 0;
+}
+
 struct altos_list *
 altos_list_start(void)
 {
 	struct altos_list *list = calloc (sizeof (struct altos_list), 1);
 	CFMutableDictionaryRef matching_dictionary = IOServiceMatching("IOUSBDevice");
-	UInt32 vendor = 0xfffe, product = 0x000a;
-	CFNumberRef vendor_ref = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vendor);
-	CFNumberRef product_ref = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &product);
 	io_iterator_t tdIterator;
 	io_object_t tdObject;
-  
-	CFDictionaryAddValue(matching_dictionary, CFSTR(kUSBVendorID), vendor_ref);
-	CFDictionaryAddValue(matching_dictionary, CFSTR(kUSBProductID), product_ref);
+	kern_return_t ret;
+	int i;
 
-	IOServiceGetMatchingServices(kIOMasterPortDefault, matching_dictionary, &list->iterator);
-  
-	CFRelease(vendor_ref);
-	CFRelease(product_ref);
+	ret = IOServiceGetMatchingServices(kIOMasterPortDefault, matching_dictionary, &list->iterator);
+	if (ret != kIOReturnSuccess)
+		return NULL;
 	return list;
 }
 
@@ -423,8 +439,15 @@ altos_list_next(struct altos_list *list, struct altos_device *device)
 		if (!object)
 			return 0;
   
+		if (!get_number (object, CFSTR(kUSBVendorID), &device->vendor) ||
+		    !get_number (object, CFSTR(kUSBProductID), &device->product))
+			continue;
+		if (device->vendor != 0xfffe)
+			continue;
+		if (device->product < 0x000a || 0x0013 < device->product)
+			continue;
 		if (get_string (object, CFSTR("IOCalloutDevice"), device->path, sizeof (device->path)) &&
-		    get_string (object, CFSTR("USB Product Name"), device->product, sizeof (device->product)) &&
+		    get_string (object, CFSTR("USB Product Name"), device->name, sizeof (device->name)) &&
 		    get_string (object, CFSTR("USB Serial Number"), serial_string, sizeof (serial_string))) {
 			device->serial = atoi(serial_string);
 			return 1;