aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx18
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-01-19 16:31:22 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:25 -0400
commit6ce9ee539c42291475c1fd7b374a10c1fe00ea33 (patch)
tree83854ed3e4973ba813800c0dee652687ffaeab2c /drivers/media/video/cx18
parentbe411df610a970a0ab90e3b02d025ab2a3554b61 (diff)
V4L/DVB (10284): cx18: Add initial entry for a Leadtek DVR3100 H hybrid card
Card report provided by Patryk on the ivtv-devel list: http://ivtvdriver.org/pipermail/ivtv-devel/2009-January/005922.html Reported-by: Pat <tatyrza@mm.pl> Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r--drivers/media/video/cx18/cx18-cards.c5
-rw-r--r--drivers/media/video/cx18/cx18-driver.c2
-rw-r--r--drivers/media/video/cx18/cx18-driver.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index e274043657dd..a0d4d2e49d1b 100644
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -339,13 +339,14 @@ static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {
339/* Leadtek WinFast PVR2100 */ 339/* Leadtek WinFast PVR2100 */
340 340
341static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = { 341static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {
342 { PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 }, 342 { PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 }, /* PVR2100 */
343 { PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6690 }, /* DVR3100 H */
343 { 0, 0, 0 } 344 { 0, 0, 0 }
344}; 345};
345 346
346static const struct cx18_card cx18_card_leadtek_pvr2100 = { 347static const struct cx18_card cx18_card_leadtek_pvr2100 = {
347 .type = CX18_CARD_LEADTEK_PVR2100, 348 .type = CX18_CARD_LEADTEK_PVR2100,
348 .name = "Leadtek WinFast PVR2100", 349 .name = "Leadtek WinFast PVR2100/DVR3100 H",
349 .comment = "Experimenters and photos needed for device to work well.\n" 350 .comment = "Experimenters and photos needed for device to work well.\n"
350 "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n", 351 "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
351 .v4l2_capabilities = CX18_CAP_ENCODER, 352 .v4l2_capabilities = CX18_CAP_ENCODER,
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 1d3a865b9c6d..0f13fdd890a4 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -159,7 +159,7 @@ MODULE_PARM_DESC(cardtype,
159 "\t\t\t 4 = Yuan MPC718\n" 159 "\t\t\t 4 = Yuan MPC718\n"
160 "\t\t\t 5 = Conexant Raptor PAL/SECAM\n" 160 "\t\t\t 5 = Conexant Raptor PAL/SECAM\n"
161 "\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n" 161 "\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"
162 "\t\t\t 7 = Leadtek WinFast PVR2100\n" 162 "\t\t\t 7 = Leadtek WinFast PVR2100/DVR3100 H\n"
163 "\t\t\t 0 = Autodetect (default)\n" 163 "\t\t\t 0 = Autodetect (default)\n"
164 "\t\t\t-1 = Ignore this card\n\t\t"); 164 "\t\t\t-1 = Ignore this card\n\t\t");
165MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60"); 165MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 2d5bcbf1b236..3a21013cd82b 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -80,7 +80,7 @@
80#define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */ 80#define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */
81#define CX18_CARD_CNXT_RAPTOR_PAL 4 /* Conexant Raptor PAL */ 81#define CX18_CARD_CNXT_RAPTOR_PAL 4 /* Conexant Raptor PAL */
82#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/ 82#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/
83#define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100 */ 83#define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100/DVR3100 H */
84#define CX18_CARD_LAST 6 84#define CX18_CARD_LAST 6
85 85
86#define CX18_ENC_STREAM_TYPE_MPG 0 86#define CX18_ENC_STREAM_TYPE_MPG 0