X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=libaltos%2Flibaltos_darwin.c;h=794c021500e8673c237297c0677f224fcc15a4a1;hb=c4708930ebfbc056bb4faae9b23720d3be401978;hp=04194d9ac5809392e228ac3681c143867ffaffda;hpb=565d8f22c23c7c6c6817d11ef1ca02e70ba5d2ae;p=fw%2Faltos diff --git a/libaltos/libaltos_darwin.c b/libaltos/libaltos_darwin.c index 04194d9a..794c0215 100644 --- a/libaltos/libaltos_darwin.c +++ b/libaltos/libaltos_darwin.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 @@ -191,7 +192,8 @@ altos_list_next(struct altos_list *list, struct altos_device *device) if (get_number (usb_device, CFSTR(kUSBVendorID), &device->vendor) && get_number (usb_device, CFSTR(kUSBProductID), &device->product) && get_string (object, CFSTR(kIOCalloutDeviceKey), device->path, sizeof (device->path)) && - get_string (usb_device, CFSTR(kUSBProductString), device->name, sizeof (device->name)) && + (get_string (usb_device, CFSTR("kUSBProductString"), device->name, sizeof (device->name)) || + get_string (usb_device, CFSTR(kUSBProductString), device->name, sizeof (device->name))) && get_string (usb_device, CFSTR(kUSBSerialNumberString), serial_string, sizeof (serial_string))) { device->serial = atoi(serial_string); IOObjectRelease(object);