From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]:40443 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757170AbZLISvc (ORCPT ); Wed, 9 Dec 2009 13:51:32 -0500 Message-ID: <4B1FF1B6.207@redhat.com> Date: Wed, 09 Dec 2009 16:51:34 -0200 From: Mauro Carvalho Chehab MIME-Version: 1.0 To: Huang Shijie CC: linux-media@vger.kernel.org Subject: Re: [PATCH 08/11] add vbi code for tlg2300 References: <1258687493-4012-1-git-send-email-shijie8@gmail.com> <1258687493-4012-2-git-send-email-shijie8@gmail.com> <1258687493-4012-3-git-send-email-shijie8@gmail.com> <1258687493-4012-4-git-send-email-shijie8@gmail.com> <1258687493-4012-5-git-send-email-shijie8@gmail.com> <1258687493-4012-6-git-send-email-shijie8@gmail.com> <1258687493-4012-7-git-send-email-shijie8@gmail.com> <1258687493-4012-8-git-send-email-shijie8@gmail.com> <1258687493-4012-9-git-send-email-shijie8@gmail.com> In-Reply-To: <1258687493-4012-9-git-send-email-shijie8@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Huang Shijie wrote: > This is the vbi module for tlg2300. > > Signed-off-by: Huang Shijie > --- > drivers/media/video/tlg2300/pd-vbi.c | 183 ++++++++++++++++++++++++++++++++++ > 1 files changed, 183 insertions(+), 0 deletions(-) > create mode 100644 drivers/media/video/tlg2300/pd-vbi.c > > diff --git a/drivers/media/video/tlg2300/pd-vbi.c b/drivers/media/video/tlg2300/pd-vbi.c > new file mode 100644 > index 0000000..fb9ee0d > --- /dev/null > +++ b/drivers/media/video/tlg2300/pd-vbi.c > @@ -0,0 +1,183 @@ > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "vendorcmds.h" > +#include "pd-common.h" > + > +int vbi_request_buf(struct vbi_data *vbi_data, size_t size) > +{ > + int i, count = 4; > + > + pd_bufqueue_init(&vbi_data->vbi_queue, &count, size, KERNEL_MEM); > + > + for (i = 0; i < count; i++) > + pd_bufqueue_qbuf(&vbi_data->vbi_queue, i); > + > + vbi_data->buf_count = count; > + return 0; > +} > + > +int vbi_release_buf(struct vbi_data *vbi_data) > +{ > + if (vbi_data->buf_count) { > + pd_bufqueue_cleanup(&vbi_data->vbi_queue); > + pd_bufqueue_wakeup(&vbi_data->vbi_queue); > + vbi_data->buf_count = 0; > + } > + return 0; > +} > + > +static long vbi_v4l2_ioctl(struct file *file, > + u32 cmd, unsigned long argp) > +{ No. You should use struct v4l2_ioctl_ops for the ioctls. It should be noticed that VBI setup should happen on _any_ V4L interface. So, the same ioctl that sets video, should also set VBI. So, the code bellow should be merged with the video part of the driver. > + struct poseidon *pd = file->private_data; > + int ret = 0; > + > + mutex_lock(&pd->lock); > + switch (cmd) { > + case VIDIOC_QUERYCAP: { > + struct v4l2_capability *t_cap = (struct v4l2_capability *)argp; > + > + strcpy(t_cap->driver, "Telegent Driver"); > + strcpy(t_cap->card, "Telegent Poseidon"); > + strcpy(t_cap->bus_info, "USB bus"); > + t_cap->version = 0; > + t_cap->capabilities = V4L2_CAP_VBI_CAPTURE; > + } > + break; > + > + case VIDIOC_S_FMT: > + case VIDIOC_G_FMT: { > + struct v4l2_format *v4l2_f = (struct v4l2_format *)argp; > + > + v4l2_f->fmt.vbi.sampling_rate = 6750000 * 4; > + v4l2_f->fmt.vbi.samples_per_line = 720*2/* VBI_LINE_LENGTH */; > + v4l2_f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY; > + v4l2_f->fmt.vbi.offset = 64 * 4; /*FIXME: why offset */ > + if (pd->video_data.tvnormid & V4L2_STD_525_60) { > + v4l2_f->fmt.vbi.start[0] = 10; > + v4l2_f->fmt.vbi.start[1] = 264; > + v4l2_f->fmt.vbi.count[0] = V4L_NTSC_VBI_LINES; > + v4l2_f->fmt.vbi.count[1] = V4L_NTSC_VBI_LINES; > + } else { > + v4l2_f->fmt.vbi.start[0] = 6; > + v4l2_f->fmt.vbi.start[1] = 314; > + v4l2_f->fmt.vbi.count[0] = V4L_PAL_VBI_LINES; > + v4l2_f->fmt.vbi.count[1] = V4L_PAL_VBI_LINES; > + } > + /* VBI_UNSYNC VBI_INTERLACED */ > + v4l2_f->fmt.vbi.flags = V4L2_VBI_UNSYNC; > + } > + break; > + > + default: > + ret = -EINVAL; > + } > + mutex_unlock(&pd->lock); > + return ret; > +} > + > +static ssize_t vbi_read(struct file *file, char __user *buffer, > + size_t count, loff_t *ppos) > +{ > + struct poseidon *pd = file->private_data; > + struct vbi_data *vbi = &pd->vbi_data; > + > + return vbi->buf_count ? > + pd_bufqueue_read(&vbi->vbi_queue, file->f_flags, buffer, count) > + : -EINVAL; > +} > + > +static int vbi_open(struct file *file) > +{ > + int ret = 0; > + struct video_device *vd = video_devdata(file); > + struct poseidon *pd = video_get_drvdata(vd); > + > + if (!pd) > + return -ENODEV; > + > + mutex_lock(&pd->lock); > + if (pd->state & POSEIDON_STATE_DISCONNECT) { > + ret = -ENODEV; > + goto out; > + } > + kref_get(&pd->kref); > + file->private_data = pd; > + set_debug_mode(vd, debug_mode); > +out: > + mutex_unlock(&pd->lock); > + return ret; > +} > + > +static int vbi_release(struct file *file) > +{ > + struct poseidon *pd = file->private_data; > + > + if (!pd) > + return -ENODEV; > + > + kref_put(&pd->kref, poseidon_delete); > + return 0; > +} > + > +static const struct v4l2_file_operations vbi_file_ops = { > + .owner = THIS_MODULE, > + .open = vbi_open, > + .release = vbi_release, > + .read = vbi_read, > + .ioctl = vbi_v4l2_ioctl, > +}; > + > +static struct video_device vbi_device = { > + .name = "poseidon_vbi", > + .fops = &vbi_file_ops, > + .release = video_device_release, > +}; > + > +int vbi_init(struct poseidon *pd) > +{ > + int ret = 0; > + > + memset(&(pd->vbi_data), 0, sizeof(struct vbi_data)); > + > + pd->vbi_data.vbi_dev = vdev_init(pd, &vbi_device); > + if (pd->vbi_data.vbi_dev == NULL) { > + ret = -ENOMEM; > + goto vbi_error; > + } > + > + if (video_register_device(pd->vbi_data.vbi_dev, VFL_TYPE_VBI, -1) < 0) { > + video_device_release(pd->vbi_data.vbi_dev); > + pd->vbi_data.vbi_dev = NULL; > + printk(KERN_DEBUG"vbi_init : video device register failed\n"); > + ret = -1; > + } > + > +vbi_error: > + return ret; > +} > + > +int vbi_exit(struct poseidon *pd) > +{ > + struct vbi_data *vbi_data = &pd->vbi_data; > + > + if (vbi_data->vbi_dev) { > + video_unregister_device(vbi_data->vbi_dev); > + vbi_data->vbi_dev = NULL; > + } > + return 0; > +}