USB: misc: iowarrior: add support for the 100 device
Greg Kroah-Hartman
maintainerPATCH 1/1 USB: misc: iowarrior: add support for the 100 device
Add a new device id for the 100 devie. It has 4 interfaces like the 28 and 28L devices but a larger endpoint so more I/O pins.
Cc Christoph Jung <[email protected]>
Cc stable <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/usb/misc/iowarrior.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/usb/misc/iowarrior.c +7 -2
@@ -36,6 +36,7 @@/* fuller speed iowarrior */ #define USB_DEVICE_ID_CODEMERCS_IOW28 0x1504#define USB_DEVICE_ID_CODEMERCS_IOW28L 0x1505 +#define USB_DEVICE_ID_CODEMERCS_IOW100 0x1506/* OEMed devices */ #define USB_DEVICE_ID_CODEMERCS_IOW24SAG 0x158a
@@ -144,6 +145,7 @@ static const struct usb_device_id iowarrior_ids[] = { {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW56AM)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28)}, {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW28L)}, + {USB_DEVICE(USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW100)}, {} /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, iowarrior_ids);
@@ -386,6 +388,7 @@ static ssize_t iowarrior_write(struct file *file,case USB_DEVICE_ID_CODEMERCS_IOW56AM :case USB_DEVICE_ID_CODEMERCS_IOW28 :case USB_DEVICE_ID_CODEMERCS_IOW28L : +case USB_DEVICE_ID_CODEMERCS_IOW100 :/* The IOW56 uses asynchronous IO and more urbs */ if (atomic_read (&dev->write_busy) ==MAX_WRITES_IN_FLIGHT ) {/* Wait until we are below the limit for submitted urbs */
@@ -786,7 +789,8 @@ static int iowarrior_probe(struct usb_interface *interface,if ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28 ) || - (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L )) { + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L ) || + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW100 )) { res =usb_find_last_int_out_endpoint (iface_desc, &dev->int_out_endpoint);if (res) {
@@ -802,7 +806,8 @@ static int iowarrior_probe(struct usb_interface *interface, ((dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56 ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW56AM ) || (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28 ) || - (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW28L))) + (dev->product_id ==USB_DEVICE_ID_CODEMERCS_IOW28L ) || + (dev->product_id == USB_DEVICE_ID_CODEMERCS_IOW100))) /* IOWarrior56 has wMaxPacketSize different from report size */ dev->report_size = 7;
base-commit: bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9
prerequisite-patch-id: de0eb78ec316f2890ad7f235832eafb221b2d9b1
prerequisite-patch-id: 4fb8fac9e49d2dad489f45c00d4d5e469e72e752
Signature · 1 line
2.25.0