diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/usb/uss720.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/usb/uss720.c')
| -rw-r--r-- | drivers/usb/uss720.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/drivers/usb/uss720.c b/drivers/usb/uss720.c index da61b5214..f97f5f639 100644 --- a/drivers/usb/uss720.c +++ b/drivers/usb/uss720.c @@ -32,6 +32,7 @@ * 0.3 10.08.99 fixing merge errors * 0.4 13.08.99 Added Vendor/Product ID of Brad Hard's cable * 0.5 20.09.99 usb_control_msg wrapper used + * Nov01.00 usb_device_table support by Adam J. Richter * */ @@ -534,7 +535,8 @@ static struct parport_operations parport_uss720_ops = /* --------------------------------------------------------------------- */ -static void * uss720_probe(struct usb_device *usbdev, unsigned int ifnum) +static void * uss720_probe(struct usb_device *usbdev, unsigned int ifnum, + const struct usb_device_id *id) { struct usb_interface_descriptor *interface; struct usb_endpoint_descriptor *endpoint; @@ -542,11 +544,6 @@ static void * uss720_probe(struct usb_device *usbdev, unsigned int ifnum) struct parport *pp; int i; - if ((usbdev->descriptor.idVendor != 0x047e || usbdev->descriptor.idProduct != 0x1001) && - (usbdev->descriptor.idVendor != 0x0557 || usbdev->descriptor.idProduct != 0x2001) && - (usbdev->descriptor.idVendor != 0x0729 || usbdev->descriptor.idProduct != 0x1284)) - return NULL; - printk(KERN_DEBUG "uss720: probe: vendor id 0x%x, device id 0x%x\n", usbdev->descriptor.idVendor, usbdev->descriptor.idProduct); @@ -626,11 +623,22 @@ static void uss720_disconnect(struct usb_device *usbdev, void *ptr) MOD_DEC_USE_COUNT; } +/* table of cables that work through this driver */ +static struct usb_device_id uss720_table [] = { + { idVendor: 0x047e, idProduct: 0x1001}, + { idVendor: 0x0557, idProduct: 0x2001}, + { idVendor: 0x0729, idProduct: 0x1284}, + { } /* Terminating entry */ +}; + +MODULE_DEVICE_TABLE (usb, uss720_table); + + static struct usb_driver uss720_driver = { - "uss720", - uss720_probe, - uss720_disconnect, - { NULL, NULL } + name: "uss720", + probe: uss720_probe, + disconnect: uss720_disconnect, + id_table: uss720_table, }; /* --------------------------------------------------------------------- */ |