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

Commit 4270c3ca authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: Add initial support for Hauppauge USB-Live2 



Add initial support for the Hauppauge USBLive 2 (2040:c200).  Note that I
had to copy a bunch of the case statements used for the Conexant video grabber
reference design (which also doesn't have a tuner).  This will likely need to
be refactored out into the board profile.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8d4c20c9

drivers/media/video/cx231xx/cx231xx-avcore.c

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev, 
	case CX231XX_BOARD_CNXT_RDU_253S:

	case CX231XX_BOARD_CNXT_VIDEO_GRABBER:

	case CX231XX_BOARD_HAUPPAUGE_EXETER:

	case CX231XX_BOARD_HAUPPAUGE_USBLIVE2:

		if (avmode == POLARIS_AVMODE_ANALOGT_TV) {

			while (afe_power_status != (FLD_PWRDN_TUNING_BIAS |

						FLD_PWRDN_ENABLE_PLL)) {

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

+27 −6
Original line number Diff line number Diff line
@@ -378,11 +378,29 @@ struct cx231xx_board cx231xx_boards[] = { 
			.gpio = 0,

		} },

	},











	[CX231XX_BOARD_HAUPPAUGE_USBLIVE2] = {

		.name = "Hauppauge USB Live 2",

		.tuner_type = TUNER_ABSENT,

		.decoder = CX231XX_AVDECODER,

		.demod_xfer_mode = 0,

		.ctl_pin_status_mask = 0xFFFFFFC4,

		.agc_analog_digital_select_gpio = 0x0c,

		.gpio_pin_status_mask = 0x4001000,

		.norm = V4L2_STD_NTSC,

		.input = {{

			.type = CX231XX_VMUX_COMPOSITE1,

			.vmux = CX231XX_VIN_2_1,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = 0,

		}, {

			.type = CX231XX_VMUX_SVIDEO,

			.vmux = CX231XX_VIN_1_1 |

				(CX231XX_VIN_1_2 << 8) |

				CX25840_SVIDEO_ON,

			.amux = CX231XX_AMUX_LINE_IN,

			.gpio = 0,

		} },

	},

};

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

	{USB_DEVICE(0x2040, 0xb140),

	 .driver_info = CX231XX_BOARD_HAUPPAUGE_EXETER},

	{USB_DEVICE(0x2040, 0xc200),

	 .driver_info = CX231XX_BOARD_HAUPPAUGE_USBLIVE2},

	{},

};
@@ -688,7 +708,8 @@ static int cx231xx_init_dev(struct cx231xx **devhandle, struct usb_device *udev, 


	/*To workaround error number=-71 on EP0 for VideoGrabber,

		 need set alt here.*/

	if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) {

	if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER ||

	    dev->model == CX231XX_BOARD_HAUPPAUGE_USBLIVE2) {

		cx231xx_set_alt_setting(dev, INDEX_VIDEO, 3);

		cx231xx_set_alt_setting(dev, INDEX_VANC, 1);

	}

drivers/media/video/cx231xx/cx231xx-core.c

+6 −3
Original line number Diff line number Diff line
@@ -628,7 +628,8 @@ int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt) 
		usb_interface_index, alt);

		/*To workaround error number=-71 on EP0 for videograbber,

		 need add following codes.*/

		if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER)

		if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER &&

		    dev->model != CX231XX_BOARD_HAUPPAUGE_USBLIVE2)

			return -1;

	}
@@ -1327,7 +1328,8 @@ int cx231xx_dev_init(struct cx231xx *dev) 
	/* init hardware */

	/* Note : with out calling set power mode function,

	afe can not be set up correctly */

	if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER) {

	if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER ||

	    dev->model == CX231XX_BOARD_HAUPPAUGE_USBLIVE2) {

		errCode = cx231xx_set_power_mode(dev,

				 POLARIS_AVMODE_ENXTERNAL_AV);

		if (errCode < 0) {
@@ -1427,7 +1429,8 @@ int cx231xx_dev_init(struct cx231xx *dev) 
		cx231xx_set_alt_setting(dev, INDEX_TS1, 0);



	/* set the I2C master port to 3 on channel 1 */

	if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER)

	if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER &&

	    dev->model != CX231XX_BOARD_HAUPPAUGE_USBLIVE2)

		errCode = cx231xx_enable_i2c_for_tuner(dev, I2C_3);



	return errCode;

drivers/media/video/cx231xx/cx231xx-video.c

+6 −3
Original line number Diff line number Diff line
@@ -2256,7 +2256,8 @@ static int cx231xx_v4l2_open(struct file *filp) 
		dev->height = norm_maxh(dev);



		/* Power up in Analog TV mode */

		if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER)

		if (dev->model == CX231XX_BOARD_CNXT_VIDEO_GRABBER ||

		    dev->model == CX231XX_BOARD_HAUPPAUGE_USBLIVE2)

			cx231xx_set_power_mode(dev,

				 POLARIS_AVMODE_ENXTERNAL_AV);

		else
@@ -2296,7 +2297,8 @@ static int cx231xx_v4l2_open(struct file *filp) 
	if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {

		/* Set the required alternate setting  VBI interface works in

		   Bulk mode only */

		if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER)

		if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER &&

		    dev->model != CX231XX_BOARD_HAUPPAUGE_USBLIVE2)

			cx231xx_set_alt_setting(dev, INDEX_VANC, 0);



		videobuf_queue_vmalloc_init(&fh->vb_vidq, &cx231xx_vbi_qops,
@@ -2371,7 +2373,8 @@ static int cx231xx_v4l2_close(struct file *filp) 


	/*To workaround error number=-71 on EP0 for VideoGrabber,

		 need exclude following.*/

	if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER)

	if (dev->model != CX231XX_BOARD_CNXT_VIDEO_GRABBER &&

	    dev->model != CX231XX_BOARD_HAUPPAUGE_USBLIVE2)

		if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {

			videobuf_stop(&fh->vb_vidq);

			videobuf_mmap_free(&fh->vb_vidq);

drivers/media/video/cx231xx/cx231xx.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#define CX231XX_BOARD_CNXT_RDE_250    	6

#define CX231XX_BOARD_CNXT_RDU_250     	7

#define CX231XX_BOARD_HAUPPAUGE_EXETER  8

#define CX231XX_BOARD_HAUPPAUGE_USBLIVE2 9



/* Limits minimum and default number of buffers */

#define CX231XX_MIN_BUF                 4