diff --git a/ChangeLog b/ChangeLog index e84be5e02..c623cbf3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-03-08 Henning Meier-Geinitz + + * tools/check-usb-scanner.c: GL841 max packet size can be 512 + bytes on USB 2.0. + 2004-03-04 Oliver Schirrmeister * backend/fujitsu.c enabled dropoutcolor for fi4x20C diff --git a/tools/check-usb-chip.c b/tools/check-usb-chip.c index 0450f7055..752c2a05c 100644 --- a/tools/check-usb-chip.c +++ b/tools/check-usb-chip.c @@ -1,7 +1,7 @@ /* check-usb-chip.c -- Find out what USB scanner chipset is used - Copyright (C) 2003 Henning Meier-Geinitz + Copyright (C) 2003, 2004 Henning Meier-Geinitz Copyright (C) 2003 Gerhard Jäger for LM983x tests Copyright (C) 2003 Gerard Klaver @@ -1548,8 +1548,10 @@ check_gl841 (struct usb_device *dev) bEndpointAddress != 0x81) || (dev->config[0].interface[0].altsetting[0].endpoint[0]. bmAttributes != 0x02) - || (dev->config[0].interface[0].altsetting[0].endpoint[0]. - wMaxPacketSize != 0x40) + || ((dev->config[0].interface[0].altsetting[0].endpoint[0]. + wMaxPacketSize != 0x40) && + (dev->config[0].interface[0].altsetting[0].endpoint[0]. + wMaxPacketSize != 0x200)) || (dev->config[0].interface[0].altsetting[0].endpoint[0].bInterval != 0x0)) { @@ -1570,8 +1572,10 @@ check_gl841 (struct usb_device *dev) bEndpointAddress != 0x02) || (dev->config[0].interface[0].altsetting[0].endpoint[1]. bmAttributes != 0x02) - || (dev->config[0].interface[0].altsetting[0].endpoint[1]. - wMaxPacketSize != 0x40) + || ((dev->config[0].interface[0].altsetting[0].endpoint[1]. + wMaxPacketSize != 0x40) && + (dev->config[0].interface[0].altsetting[0].endpoint[1]. + wMaxPacketSize != 0x200)) || (dev->config[0].interface[0].altsetting[0].endpoint[1].bInterval != 0)) {