aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJochen Issing <jochen@isign-softart.de>2006-08-19 15:03:21 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 11:30:34 -0400
commitded38d2806b508b0b0f95581c103958949403daf (patch)
tree94ea1249b0ab5a1fe49b5f20f3be04ee19d1cc61 /drivers
parent56760f07a7948d53b807c8f00c1639df9acf97fd (diff)
V4L/DVB (4528): PATCH: Club 3D zap250mini
After some structural changes, here comes the updated patch for the Club 3D zap250mini USB dvb device. Adding support for a WideView-based device with a different "COLD" ID. Signed-off-by: Jochen Issing <jochen.issing@isign-softart.de> Signed-off-by: Patrick Boettcher <pb@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/dtt200u.c5
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h1
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
index 8134786f65b2..27af4e436479 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -118,6 +118,7 @@ static struct usb_device_id dtt200u_usb_table [] = {
118 { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_WT220U_ZL0353_WARM) }, 118 { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_WT220U_ZL0353_WARM) },
119 { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_WT220U_FC_COLD) }, 119 { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_WT220U_FC_COLD) },
120 { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_WT220U_FC_WARM) }, 120 { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_WT220U_FC_WARM) },
121 { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_WT220U_ZAP250_COLD) },
121 { 0 }, 122 { 0 },
122}; 123};
123MODULE_DEVICE_TABLE(usb, dtt200u_usb_table); 124MODULE_DEVICE_TABLE(usb, dtt200u_usb_table);
@@ -197,7 +198,7 @@ static struct dvb_usb_properties wt220u_properties = {
197 .num_device_descs = 1, 198 .num_device_descs = 1,
198 .devices = { 199 .devices = {
199 { .name = "WideView WT-220U PenType Receiver (Typhoon/Freecom)", 200 { .name = "WideView WT-220U PenType Receiver (Typhoon/Freecom)",
200 .cold_ids = { &dtt200u_usb_table[2], NULL }, 201 .cold_ids = { &dtt200u_usb_table[2], &dtt200u_usb_table[8], NULL },
201 .warm_ids = { &dtt200u_usb_table[3], NULL }, 202 .warm_ids = { &dtt200u_usb_table[3], NULL },
202 }, 203 },
203 { NULL }, 204 { NULL },
@@ -316,6 +317,6 @@ module_init(dtt200u_usb_module_init);
316module_exit(dtt200u_usb_module_exit); 317module_exit(dtt200u_usb_module_exit);
317 318
318MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>"); 319MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
319MODULE_DESCRIPTION("Driver for the WideView/Yakumo/Hama/Typhoon DVB-T USB2.0 devices"); 320MODULE_DESCRIPTION("Driver for the WideView/Yakumo/Hama/Typhoon/Club3D DVB-T USB2.0 devices");
320MODULE_VERSION("1.0"); 321MODULE_VERSION("1.0");
321MODULE_LICENSE("GPL"); 322MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index f841663dd31b..57a10de1d3dd 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -86,6 +86,7 @@
86#define USB_PID_HANFTEK_UMT_010_WARM 0x0015 86#define USB_PID_HANFTEK_UMT_010_WARM 0x0015
87#define USB_PID_DTT200U_COLD 0x0201 87#define USB_PID_DTT200U_COLD 0x0201
88#define USB_PID_DTT200U_WARM 0x0301 88#define USB_PID_DTT200U_WARM 0x0301
89#define USB_PID_WT220U_ZAP250_COLD 0x0220
89#define USB_PID_WT220U_COLD 0x0222 90#define USB_PID_WT220U_COLD 0x0222
90#define USB_PID_WT220U_WARM 0x0221 91#define USB_PID_WT220U_WARM 0x0221
91#define USB_PID_WT220U_FC_COLD 0x0225 92#define USB_PID_WT220U_FC_COLD 0x0225