From b6e197667f5c94edca5f6617b897cf9b879e4a2a Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Wed, 23 Sep 2009 13:23:22 +0200 Subject: Match a range of supported USB IDs and make iPod Touch 64GB work --- daemon/usb-linux.c | 7 ++----- daemon/usb.h | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'daemon') diff --git a/daemon/usb-linux.c b/daemon/usb-linux.c index 6f25ed4..f1be612 100644 --- a/daemon/usb-linux.c +++ b/daemon/usb-linux.c @@ -274,11 +274,8 @@ static int usb_discover(void) } if(devdesc.idVendor != VID_APPLE) continue; - if( (devdesc.idProduct != PID_IPHONE2G) && - (devdesc.idProduct != PID_ITOUCH1G) && - (devdesc.idProduct != PID_IPHONE3G) && - (devdesc.idProduct != PID_ITOUCH2G) && - (devdesc.idProduct != PID_IPHONE3GS)) + if((devdesc.idProduct < PID_RANGE_LOW) && + (devdesc.idProduct > PID_RANGE_MAX)) continue; libusb_device_handle *handle; usbmuxd_log(LL_INFO, "Found new device with v/p %04x:%04x at %d-%d", devdesc.idVendor, devdesc.idProduct, bus, address); diff --git a/daemon/usb.h b/daemon/usb.h index 621ccb2..7e20dce 100644 --- a/daemon/usb.h +++ b/daemon/usb.h @@ -42,11 +42,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define USB_PACKET_SIZE 512 #define VID_APPLE 0x5ac -#define PID_IPHONE2G 0x1290 -#define PID_ITOUCH1G 0x1291 -#define PID_IPHONE3G 0x1292 -#define PID_ITOUCH2G 0x1293 -#define PID_IPHONE3GS 0x1294 +#define PID_RANGE_LOW 0x1290 +#define PID_RANGE_MAX 0x1299 #define USB_INTERFACE 1 -- cgit v1.1-32-gdbae