diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2009-03-15 17:52:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:27 -0400 |
commit | dd27ade7a9195cb3b1f56df4d0ec39763830390b (patch) | |
tree | b03b9db2c46896e3565911977f795374877838a0 /drivers/media/video/au0828/au0828-video.c | |
parent | 62899a28008d635f25c3408b4cc46021f0cb34d3 (diff) |
V4L/DVB (11086): au0828: rename macro for currently non-function VBI support
The VBI support or the au0828 has the framework written but it does not yet
work. Rename the macro per Mauro's request.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/au0828/au0828-video.c')
-rw-r--r-- | drivers/media/video/au0828/au0828-video.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c index 057496414ea2..e1940467b472 100644 --- a/drivers/media/video/au0828/au0828-video.c +++ b/drivers/media/video/au0828/au0828-video.c | |||
@@ -750,7 +750,7 @@ static int au0828_v4l2_open(struct file *filp) | |||
750 | dev = h; | 750 | dev = h; |
751 | type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | 751 | type = V4L2_BUF_TYPE_VIDEO_CAPTURE; |
752 | } | 752 | } |
753 | #ifdef VBI_NOT_YET_WORKING | 753 | #ifdef VBI_IS_WORKING |
754 | if (h->vbi_dev->minor == minor) { | 754 | if (h->vbi_dev->minor == minor) { |
755 | dev = h; | 755 | dev = h; |
756 | type = V4L2_BUF_TYPE_VBI_CAPTURE; | 756 | type = V4L2_BUF_TYPE_VBI_CAPTURE; |
@@ -929,7 +929,7 @@ static int au0828_set_format(struct au0828_dev *dev, unsigned int cmd, | |||
929 | maxwidth = 720; | 929 | maxwidth = 720; |
930 | maxheight = 480; | 930 | maxheight = 480; |
931 | 931 | ||
932 | #ifdef VBI_NOT_YET_WORKING | 932 | #ifdef VBI_IS_WORKING |
933 | if (format->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) { | 933 | if (format->type == V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) { |
934 | dprintk(1, "VBI format set: to be supported!\n"); | 934 | dprintk(1, "VBI format set: to be supported!\n"); |
935 | return 0; | 935 | return 0; |
@@ -1017,7 +1017,7 @@ static int vidioc_querycap(struct file *file, void *priv, | |||
1017 | 1017 | ||
1018 | /*set the device capabilities */ | 1018 | /*set the device capabilities */ |
1019 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | | 1019 | cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | |
1020 | #ifdef VBI_NOT_YET_WORKING | 1020 | #ifdef VBI_IS_WORKING |
1021 | V4L2_CAP_VBI_CAPTURE | | 1021 | V4L2_CAP_VBI_CAPTURE | |
1022 | #endif | 1022 | #endif |
1023 | V4L2_CAP_AUDIO | | 1023 | V4L2_CAP_AUDIO | |
@@ -1549,7 +1549,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1549 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, | 1549 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
1550 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, | 1550 | .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, |
1551 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, | 1551 | .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, |
1552 | #ifdef VBI_NOT_YET_WORKING | 1552 | #ifdef VBI_IS_WORKING |
1553 | .vidioc_g_fmt_vbi_cap = vidioc_g_fmt_vbi_cap, | 1553 | .vidioc_g_fmt_vbi_cap = vidioc_g_fmt_vbi_cap, |
1554 | .vidioc_try_fmt_vbi_cap = vidioc_s_fmt_vbi_cap, | 1554 | .vidioc_try_fmt_vbi_cap = vidioc_s_fmt_vbi_cap, |
1555 | .vidioc_s_fmt_vbi_cap = vidioc_s_fmt_vbi_cap, | 1555 | .vidioc_s_fmt_vbi_cap = vidioc_s_fmt_vbi_cap, |
@@ -1557,7 +1557,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { | |||
1557 | .vidioc_g_audio = vidioc_g_audio, | 1557 | .vidioc_g_audio = vidioc_g_audio, |
1558 | .vidioc_s_audio = vidioc_s_audio, | 1558 | .vidioc_s_audio = vidioc_s_audio, |
1559 | .vidioc_cropcap = vidioc_cropcap, | 1559 | .vidioc_cropcap = vidioc_cropcap, |
1560 | #ifdef VBI_NOT_YET_WORKING | 1560 | #ifdef VBI_IS_WORKING |
1561 | .vidioc_g_fmt_sliced_vbi_cap = vidioc_g_fmt_sliced_vbi_cap, | 1561 | .vidioc_g_fmt_sliced_vbi_cap = vidioc_g_fmt_sliced_vbi_cap, |
1562 | .vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap, | 1562 | .vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap, |
1563 | .vidioc_s_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap, | 1563 | .vidioc_s_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap, |
@@ -1661,7 +1661,7 @@ int au0828_analog_register(struct au0828_dev *dev, | |||
1661 | return -ENOMEM; | 1661 | return -ENOMEM; |
1662 | } | 1662 | } |
1663 | 1663 | ||
1664 | #ifdef VBI_NOT_YET_WORKING | 1664 | #ifdef VBI_IS_WORKING |
1665 | dev->vbi_dev = video_device_alloc(); | 1665 | dev->vbi_dev = video_device_alloc(); |
1666 | if (NULL == dev->vbi_dev) { | 1666 | if (NULL == dev->vbi_dev) { |
1667 | dprintk(1, "Can't allocate vbi_device.\n"); | 1667 | dprintk(1, "Can't allocate vbi_device.\n"); |
@@ -1675,7 +1675,7 @@ int au0828_analog_register(struct au0828_dev *dev, | |||
1675 | dev->vdev->parent = &dev->usbdev->dev; | 1675 | dev->vdev->parent = &dev->usbdev->dev; |
1676 | strcpy(dev->vdev->name, "au0828a video"); | 1676 | strcpy(dev->vdev->name, "au0828a video"); |
1677 | 1677 | ||
1678 | #ifdef VBI_NOT_YET_WORKING | 1678 | #ifdef VBI_IS_WORKING |
1679 | /* Setup the VBI device */ | 1679 | /* Setup the VBI device */ |
1680 | *dev->vbi_dev = au0828_video_template; | 1680 | *dev->vbi_dev = au0828_video_template; |
1681 | dev->vbi_dev->parent = &dev->usbdev->dev; | 1681 | dev->vbi_dev->parent = &dev->usbdev->dev; |
@@ -1694,7 +1694,7 @@ int au0828_analog_register(struct au0828_dev *dev, | |||
1694 | return -ENODEV; | 1694 | return -ENODEV; |
1695 | } | 1695 | } |
1696 | 1696 | ||
1697 | #ifdef VBI_NOT_YET_WORKING | 1697 | #ifdef VBI_IS_WORKING |
1698 | /* Register the vbi device */ | 1698 | /* Register the vbi device */ |
1699 | retval = video_register_device(dev->vbi_dev, VFL_TYPE_VBI, -1); | 1699 | retval = video_register_device(dev->vbi_dev, VFL_TYPE_VBI, -1); |
1700 | if (retval != 0) { | 1700 | if (retval != 0) { |