diff options
| author | Devin Heitmueller <dheitmueller@hauppauge.com> | 2010-07-31 05:49:01 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 05:17:28 +0200 |
| commit | 4270c3cac41e248ee339d18e01251989b74a30f1 (patch) | |
| tree | e5b303f254fd41a70ee320fd57f87e0f9682c57b /drivers/media/video/cx231xx/cx231xx-video.c | |
| parent | [media] cx231xx: set correct i2c port for Exeter tuner (diff) | |
| download | linux-4270c3cac41e248ee339d18e01251989b74a30f1.tar.xz linux-4270c3cac41e248ee339d18e01251989b74a30f1.zip | |
[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: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-video.c')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-video.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index 0880edd3a49b..38367ee07cc5 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c @@ -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); |