Commit 6ce9ee53 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab
Browse files

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: default avatarPat <tatyrza@mm.pl>
Signed-off-by: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent be411df6

drivers/media/video/cx18/cx18-cards.c

+3 −2
Original line number Diff line number Diff line
@@ -339,13 +339,14 @@ static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = { 
/* Leadtek WinFast PVR2100 */



static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {

	{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 },

	{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 }, /* PVR2100   */

	{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6690 }, /* DVR3100 H */

	{ 0, 0, 0 }

};



static const struct cx18_card cx18_card_leadtek_pvr2100 = {

	.type = CX18_CARD_LEADTEK_PVR2100,

	.name = "Leadtek WinFast PVR2100",

	.name = "Leadtek WinFast PVR2100/DVR3100 H",

	.comment = "Experimenters and photos needed for device to work well.\n"

		  "\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",

	.v4l2_capabilities = CX18_CAP_ENCODER,

drivers/media/video/cx18/cx18-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ MODULE_PARM_DESC(cardtype, 
		 "\t\t\t 4 = Yuan MPC718\n"

		 "\t\t\t 5 = Conexant Raptor PAL/SECAM\n"

		 "\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"

		 "\t\t\t 7 = Leadtek WinFast PVR2100\n"

		 "\t\t\t 7 = Leadtek WinFast PVR2100/DVR3100 H\n"

		 "\t\t\t 0 = Autodetect (default)\n"

		 "\t\t\t-1 = Ignore this card\n\t\t");

MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");

drivers/media/video/cx18/cx18-driver.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
#define CX18_CARD_YUAN_MPC718 	      3	/* Yuan MPC718 */

#define CX18_CARD_CNXT_RAPTOR_PAL     4	/* Conexant Raptor PAL */

#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/

#define CX18_CARD_LEADTEK_PVR2100     6 /* Leadtek WinFast PVR2100 */

#define CX18_CARD_LEADTEK_PVR2100     6 /* Leadtek WinFast PVR2100/DVR3100 H */

#define CX18_CARD_LAST 		      6



#define CX18_ENC_STREAM_TYPE_MPG  0