Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eeec4b38 authored by Thierry MERLE's avatar Thierry MERLE Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (6994): usbvision: add Pinnacle Studio PCTV USB (NTSC) FM V3 



Add the "Pinnacle Studio PCTV USB (NTSC) FM" device.
This is the third occurrence of the same device designation...

Signed-off-by: default avatarThierry MERLE <thierry.merle@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent e9ca1c79

Documentation/video4linux/CARDLIST.usbvision

+1 −0
Original line number Diff line number Diff line
@@ -62,3 +62,4 @@ 
 61 -> Pinnacle Studio Linx Video input cable (PAL)             [2304:0301]

 62 -> Pinnacle PCTV Bungee USB (PAL) FM                        [2304:0419]

 63 -> Hauppauge WinTv-USB                                      [2400:4200]

 64 -> Pinnacle Studio PCTV USB (NTSC) FM V3                    [2304:0113]

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

+17 −1
Original line number Diff line number Diff line
@@ -901,6 +901,20 @@ struct usbvision_device_data_st usbvision_device_data[] = { 
		.Y_Offset      = -1,

		.ModelString   = "Pinnacle Studio PCTV USB (NTSC) FM",

	},

	[PINNA_PCTV_USB_NTSC_FM_V3] = {

		.Interface     = -1,

		.Codec         = CODEC_SAA7111,

		.VideoChannels = 3,

		.VideoNorm     = V4L2_STD_NTSC,

		.AudioChannels = 1,

		.Radio         = 1,

		.vbi           = 1,

		.Tuner         = 1,

		.TunerType     = TUNER_PHILIPS_NTSC_M,

		.X_Offset      = -1,

		.Y_Offset      = -1,

		.ModelString   = "Pinnacle Studio PCTV USB (NTSC) FM V3",

	},

	[PINNA_PCTV_USB_PAL_FM_V2] = {

		.Interface     = -1,

		.Codec         = CODEC_SAA7113,
@@ -1074,6 +1088,8 @@ struct usb_device_id usbvision_table [] = { 
	{ USB_DEVICE(0x2304, 0x0110), .driver_info=PINNA_PCTV_USB_PAL_FM },

	{ USB_DEVICE(0x2304, 0x0111), .driver_info=MIRO_PCTV_USB },

	{ USB_DEVICE(0x2304, 0x0112), .driver_info=PINNA_PCTV_USB_NTSC_FM },

	{ USB_DEVICE(0x2304, 0x0113),

	  .driver_info = PINNA_PCTV_USB_NTSC_FM_V3 },

	{ USB_DEVICE(0x2304, 0x0210), .driver_info=PINNA_PCTV_USB_PAL_FM_V2 },

	{ USB_DEVICE(0x2304, 0x0212), .driver_info=PINNA_PCTV_USB_NTSC_FM_V2 },

	{ USB_DEVICE(0x2304, 0x0214), .driver_info=PINNA_PCTV_USB_PAL_FM_V3 },

drivers/media/video/usbvision/usbvision-cards.h

+1 −0
Original line number Diff line number Diff line
@@ -62,5 +62,6 @@ 
#define PINNA_LINX_VD_IN_CAB_PAL                 61

#define PINNA_PCTV_BUNGEE_PAL_FM                 62

#define HPG_WINTV                                63

#define PINNA_PCTV_USB_NTSC_FM_V3                64



extern const int usbvision_device_data_size;