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

Commit 68c97bf3 authored by Alf Høgemark's avatar Alf Høgemark Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx : Add support for Elgato Video Capture V2 



This patch adds support for the Elgato Video Capture, version 2, device.
The device is added based on the code for CX231XX_BOARD_HAUPPAUGE_USBLIVE2,
it is simply a copy of the code for that board, with the proper USB device
info for the Elgato Video Capture V2 device.

Signed-off-by: default avatarAlf Høgemark <alf@i100.no>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent afe5624b

drivers/media/usb/cx231xx/cx231xx-cards.c

+29 −0
Original line number Original line Diff line number Diff line
@@ -603,6 +603,33 @@ struct cx231xx_board cx231xx_boards[] = { 
			.gpio = NULL,

			.gpio = NULL,

		} },

		} },

	},

	},

	[CX231XX_BOARD_ELGATO_VIDEO_CAPTURE_V2] = {

		.name = "Elgato Video Capture V2",

		.tuner_type = TUNER_ABSENT,

		.decoder = CX231XX_AVDECODER,

		.output_mode = OUT_MODE_VIP11,

		.demod_xfer_mode = 0,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.norm = V4L2_STD_NTSC,

		.no_alt_vanc = 1,

		.external_av = 1,

		.dont_use_port_3 = 1,

		.input = {{

			.type = CX231XX_VMUX_COMPOSITE1,

			.vmux = CX231XX_VIN_2_1,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = NULL,

		}, {

			.type = CX231XX_VMUX_SVIDEO,

			.vmux = CX231XX_VIN_1_1 |

				(CX231XX_VIN_1_2 << 8) |

				CX25840_SVIDEO_ON,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = NULL,

		} },

	},

};

};

const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);

const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
@@ -642,6 +669,8 @@ struct usb_device_id cx231xx_id_table[] = { 
	 .driver_info = CX231XX_BOARD_KWORLD_UB430_USB_HYBRID},

	 .driver_info = CX231XX_BOARD_KWORLD_UB430_USB_HYBRID},

	{USB_DEVICE(0x1f4d, 0x0237),

	{USB_DEVICE(0x1f4d, 0x0237),

	 .driver_info = CX231XX_BOARD_ICONBIT_U100},

	 .driver_info = CX231XX_BOARD_ICONBIT_U100},

	{USB_DEVICE(0x0fd9, 0x0037),

	 .driver_info = CX231XX_BOARD_ELGATO_VIDEO_CAPTURE_V2},

	{},

	{},

};

};

drivers/media/usb/cx231xx/cx231xx.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define CX231XX_BOARD_ICONBIT_U100 13

#define CX231XX_BOARD_ICONBIT_U100 13

#define CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL 14

#define CX231XX_BOARD_HAUPPAUGE_USB2_FM_PAL 14

#define CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC 15

#define CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC 15

#define CX231XX_BOARD_ELGATO_VIDEO_CAPTURE_V2 16





/* Limits minimum and default number of buffers */

/* Limits minimum and default number of buffers */

#define CX231XX_MIN_BUF                 4

#define CX231XX_MIN_BUF                 4