diff options
author | Steven Toth <stoth@hauppauge.com> | 2008-05-22 17:07:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:20:43 -0400 |
commit | 7d18d2e91b5495ed0b99c83d595a56e25521a111 (patch) | |
tree | 0739f7dcaed6eb73a11f3361042fc89fa51c59d1 | |
parent | 19d703da05de6495adfc0ec9aec927d2fce99af6 (diff) |
V4L/DVB (8271): sms1xxx: usbvid table
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/mdtv/smsusb.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/media/mdtv/smsusb.c b/drivers/media/mdtv/smsusb.c index 07c72f057387..c0f77a328ca9 100644 --- a/drivers/media/mdtv/smsusb.c +++ b/drivers/media/mdtv/smsusb.c | |||
@@ -26,11 +26,6 @@ | |||
26 | 26 | ||
27 | #include "smscoreapi.h" | 27 | #include "smscoreapi.h" |
28 | 28 | ||
29 | #define USB_VID_SIANO 0x187f | ||
30 | #define USB_PID_0010 0x0010 | ||
31 | #define USB_PID_0100 0x0100 | ||
32 | #define USB_PID_0200 0x0200 | ||
33 | |||
34 | #define USB1_BUFFER_SIZE 0x1000 | 29 | #define USB1_BUFFER_SIZE 0x1000 |
35 | #define USB2_BUFFER_SIZE 0x4000 | 30 | #define USB2_BUFFER_SIZE 0x4000 |
36 | 31 | ||
@@ -58,14 +53,6 @@ typedef struct _smsusb_device | |||
58 | int buffer_size; | 53 | int buffer_size; |
59 | } *psmsusb_device_t; | 54 | } *psmsusb_device_t; |
60 | 55 | ||
61 | static struct usb_device_id smsusb_id_table [] = { | ||
62 | { USB_DEVICE(USB_VID_SIANO, USB_PID_0010) }, | ||
63 | { USB_DEVICE(USB_VID_SIANO, USB_PID_0100) }, | ||
64 | { USB_DEVICE(USB_VID_SIANO, USB_PID_0200) }, | ||
65 | { } /* Terminating entry */ | ||
66 | }; | ||
67 | MODULE_DEVICE_TABLE (usb, smsusb_id_table); | ||
68 | |||
69 | int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb); | 56 | int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb); |
70 | 57 | ||
71 | void smsusb_onresponse(struct urb *urb) | 58 | void smsusb_onresponse(struct urb *urb) |
@@ -315,7 +302,7 @@ int smsusb_init_device(struct usb_interface *intf) | |||
315 | 302 | ||
316 | switch (dev->udev->descriptor.idProduct) | 303 | switch (dev->udev->descriptor.idProduct) |
317 | { | 304 | { |
318 | case USB_PID_0100: | 305 | case 0x100: |
319 | dev->buffer_size = USB1_BUFFER_SIZE; | 306 | dev->buffer_size = USB1_BUFFER_SIZE; |
320 | 307 | ||
321 | params.setmode_handler = smsusb1_setmode; | 308 | params.setmode_handler = smsusb1_setmode; |
@@ -414,6 +401,14 @@ void smsusb_disconnect(struct usb_interface *intf) | |||
414 | smsusb_term_device(intf); | 401 | smsusb_term_device(intf); |
415 | } | 402 | } |
416 | 403 | ||
404 | static struct usb_device_id smsusb_id_table [] = { | ||
405 | { USB_DEVICE(0x187F, 0x0010) }, | ||
406 | { USB_DEVICE(0x187F, 0x0100) }, | ||
407 | { USB_DEVICE(0x187F, 0x0200) }, | ||
408 | { } /* Terminating entry */ | ||
409 | }; | ||
410 | MODULE_DEVICE_TABLE (usb, smsusb_id_table); | ||
411 | |||
417 | static struct usb_driver smsusb_driver = { | 412 | static struct usb_driver smsusb_driver = { |
418 | .name = "smsusb", | 413 | .name = "smsusb", |
419 | .probe = smsusb_probe, | 414 | .probe = smsusb_probe, |