aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-16 08:18:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:14:35 -0400
commitaaeab30f753d9499e04979e2a5a7feadba18c39d (patch)
tree06ce8a7cfd742156654523ba38b2a1bb0567ba78
parent78f3bc631f39fbfa4eaf039f0664265e71f725fb (diff)
V4L/DVB (12906): dib0700: Add support for Prolink SBTVD
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c7
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-ids.h2
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 442afbaabeef..0b2812aa30a4 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -1860,6 +1860,7 @@ struct usb_device_id dib0700_usb_id_table[] = {
1860/* 60 */{ USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS_2) }, 1860/* 60 */{ USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS_2) },
1861 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XPVR) }, 1861 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XPVR) },
1862 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XP) }, 1862 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK807XP) },
1863 { USB_DEVICE(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD) },
1863 { 0 } /* Terminating entry */ 1864 { 0 } /* Terminating entry */
1864}; 1865};
1865MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 1866MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
@@ -2365,12 +2366,16 @@ struct dvb_usb_device_properties dib0700_devices[] = {
2365 }, 2366 },
2366 }, 2367 },
2367 2368
2368 .num_device_descs = 1, 2369 .num_device_descs = 2,
2369 .devices = { 2370 .devices = {
2370 { "DiBcom STK807xP reference design", 2371 { "DiBcom STK807xP reference design",
2371 { &dib0700_usb_id_table[62], NULL }, 2372 { &dib0700_usb_id_table[62], NULL },
2372 { NULL }, 2373 { NULL },
2373 }, 2374 },
2375 { "Prolink Pixelview SBTVD",
2376 { &dib0700_usb_id_table[63], NULL },
2377 { NULL },
2378 },
2374 }, 2379 },
2375 2380
2376 .rc_interval = DEFAULT_RC_INTERVAL, 2381 .rc_interval = DEFAULT_RC_INTERVAL,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 7c0e3124a69b..2d51e3c28207 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -46,6 +46,7 @@
46#define USB_VID_MSI_2 0x1462 46#define USB_VID_MSI_2 0x1462
47#define USB_VID_OPERA1 0x695c 47#define USB_VID_OPERA1 0x695c
48#define USB_VID_PINNACLE 0x2304 48#define USB_VID_PINNACLE 0x2304
49#define USB_VID_PIXELVIEW 0x1554
49#define USB_VID_TECHNOTREND 0x0b48 50#define USB_VID_TECHNOTREND 0x0b48
50#define USB_VID_TERRATEC 0x0ccd 51#define USB_VID_TERRATEC 0x0ccd
51#define USB_VID_TELESTAR 0x10b9 52#define USB_VID_TELESTAR 0x10b9
@@ -202,6 +203,7 @@
202#define USB_PID_PINNACLE_PCTV73A 0x0243 203#define USB_PID_PINNACLE_PCTV73A 0x0243
203#define USB_PID_PINNACLE_PCTV73ESE 0x0245 204#define USB_PID_PINNACLE_PCTV73ESE 0x0245
204#define USB_PID_PINNACLE_PCTV282E 0x0248 205#define USB_PID_PINNACLE_PCTV282E 0x0248
206#define USB_PID_PIXELVIEW_SBTVD 0x5010
205#define USB_PID_PCTV_200E 0x020e 207#define USB_PID_PCTV_200E 0x020e
206#define USB_PID_PCTV_400E 0x020f 208#define USB_PID_PCTV_400E 0x020f
207#define USB_PID_PCTV_450E 0x0222 209#define USB_PID_PCTV_450E 0x0222