diff options
| author | Igor M. Liplianin <liplianin@me.by> | 2008-11-06 02:12:56 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 20:53:28 +0100 |
| commit | 4cc0edff341294d14f3a6acb3ddb97abdf29b8c0 (patch) | |
| tree | d105d3fa0f71323364b6e2f93449c4db2d6dffa7 /drivers/media/dvb/dvb-usb/dw2102.c | |
| parent | V4L/DVB (9536): WinFast DTV2000 H: add support for missing analog inputs (diff) | |
| download | linux-4cc0edff341294d14f3a6acb3ddb97abdf29b8c0.tar.xz linux-4cc0edff341294d14f3a6acb3ddb97abdf29b8c0.zip | |
V4L/DVB (9537): Add TerraTec Cinergy S USB support
Add TerraTec Cinergy S USB support
Signed-off-by: Igor M. Liplianin <liplianin@me.by>
Acked-by: Thorsten Leupold <th86@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dw2102.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dw2102.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c index c9431713df60..bc5e47a2b917 100644 --- a/drivers/media/dvb/dvb-usb/dw2102.c +++ b/drivers/media/dvb/dvb-usb/dw2102.c @@ -26,6 +26,10 @@ #define USB_PID_DW2104 0x2104 #endif +#ifndef USB_PID_CINERGY_S +#define USB_PID_CINERGY_S 0x0064 +#endif + #define DW210X_READ_MSG 0 #define DW210X_WRITE_MSG 1 @@ -577,6 +581,7 @@ static struct usb_device_id dw2102_table[] = { {USB_DEVICE(USB_VID_CYPRESS, 0x2101)}, {USB_DEVICE(USB_VID_CYPRESS, 0x2104)}, {USB_DEVICE(0x9022, 0xd650)}, + {USB_DEVICE(USB_VID_TERRATEC, USB_PID_CINERGY_S)}, { } }; @@ -646,6 +651,7 @@ static int dw2102_load_firmware(struct usb_device *dev, dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, DW210X_WRITE_MSG); break; + case USB_PID_CINERGY_S: case USB_PID_DW2102: dw210x_op_rw(dev, 0xbf, 0x0040, 0, &reset, 0, DW210X_WRITE_MSG); @@ -725,7 +731,7 @@ static struct dvb_usb_device_properties dw2102_properties = { }, } }, - .num_device_descs = 2, + .num_device_descs = 3, .devices = { {"DVBWorld DVB-S 2102 USB2.0", {&dw2102_table[0], NULL}, @@ -735,6 +741,10 @@ static struct dvb_usb_device_properties dw2102_properties = { {&dw2102_table[1], NULL}, {NULL}, }, + {"TerraTec Cinergy S USB", + {&dw2102_table[4], NULL}, + {NULL}, + }, } }; |