saa7134: improve v4l2-compliance
Subsystems (2)
cover saa7134: improve v4l2-compliance
This patch series improves v4l2-compliance of saa7134 driver. This includes only easy-to-fix things. More work is needed to fix the other problems.
Signature · 1 line
Ondrej Zary
PATCH 1/8 saa7134: v4l2-compliance: implement V4L2_CAP_DEVICE_CAPS
Make saa7134 driver more V4L2 compliant: implement V4L2_CAP_DEVICE_CAPS support and fix all capabilities problems reported by v4l2-compliance.
--- drivers/media/pci/saa7134/saa7134-video.c | 58 +++++++++++++++++------------ 1 files changed, 34 insertions(+), 24 deletions(-)
drivers/media/pci/saa7134/saa7134-video.c +34 -24
@@ -1805,6 +1805,8 @@ static int saa7134_querycap(struct file *file, void *priv, {struct saa7134_fh *fh = priv;struct saa7134_dev *dev = fh->dev; +struct video_device *vdev =video_devdata (file); +u32 radio_caps, video_caps, vbi_caps;unsigned int tuner_type = dev->tuner_type;
@@ -1812,19 +1814,40 @@ static int saa7134_querycap(struct file *file, void *priv,strlcpy (cap->card, saa7134_boards[dev->board].name,sizeof (cap->card));sprintf (cap->bus_info,"PCI:%s" ,pci_name (dev->pci)); - cap->capabilities = -V4L2_CAP_VIDEO_CAPTURE | -V4L2_CAP_VBI_CAPTURE | -V4L2_CAP_READWRITE | -V4L2_CAP_STREAMING | -V4L2_CAP_TUNER ; + + cap->device_caps =V4L2_CAP_READWRITE |V4L2_CAP_STREAMING ; +if ((tuner_type !=TUNER_ABSENT ) && (tuner_type !=UNSET )) + cap->device_caps |=V4L2_CAP_TUNER ; + + radio_caps =V4L2_CAP_RADIO ;if (dev->has_rds) - cap->capabilities |=V4L2_CAP_RDS_CAPTURE ; + radio_caps |=V4L2_CAP_RDS_CAPTURE ; + + video_caps =V4L2_CAP_VIDEO_CAPTURE ;if (saa7134_no_overlay <=0 ) - cap->capabilities |=V4L2_CAP_VIDEO_OVERLAY ; + video_caps |=V4L2_CAP_VIDEO_OVERLAY ; + + vbi_caps =V4L2_CAP_VBI_CAPTURE ; + +switch (vdev->vfl_type) { +case VFL_TYPE_RADIO : + cap->device_caps |= radio_caps; +break ; +case VFL_TYPE_GRABBER : + cap->device_caps |= video_caps; +break ; +case VFL_TYPE_VBI : + cap->device_caps |= vbi_caps; +break ; + } + cap->capabilities = radio_caps | video_caps | vbi_caps | + cap->device_caps |V4L2_CAP_DEVICE_CAPS ; +if (vdev->vfl_type ==VFL_TYPE_RADIO ) { + cap->device_caps &= ~V4L2_CAP_STREAMING ; +if (!dev->has_rds) + cap->device_caps &= ~V4L2_CAP_READWRITE ; + } -if ((tuner_type ==TUNER_ABSENT ) || (tuner_type ==UNSET )) - cap->capabilities &= ~V4L2_CAP_TUNER ;return 0 ; }
@@ -2299,19 +2322,6 @@ static int vidioc_s_register (struct file *file, void *priv, }#endif -static int radio_querycap (struct file *file,void *priv, -struct v4l2_capability *cap) -{ -struct saa7134_fh *fh = file->private_data; -struct saa7134_dev *dev = fh->dev; - -strcpy (cap->driver,"saa7134" ); -strlcpy (cap->card, saa7134_boards[dev->board].name,sizeof (cap->card)); -sprintf (cap->bus_info,"PCI:%s" ,pci_name (dev->pci)); - cap->capabilities =V4L2_CAP_TUNER ; -return 0 ; -} -static int radio_g_tuner (struct file *file,void *priv,struct v4l2_tuner *t) {
@@ -2473,7 +2483,7 @@ static const struct v4l2_file_operations radio_fops = { };static const struct v4l2_ioctl_ops radio_ioctl_ops = { - .vidioc_querycap = radio_querycap, + .vidioc_querycap = saa7134_querycap, .vidioc_g_tuner = radio_g_tuner, .vidioc_enum_input = radio_enum_input, .vidioc_g_audio = radio_g_audio,
Signature · 1 line
Ondrej Zary
PATCH 2/8 saa7134: v4l2-compliance: don't report invalid audio modes for radio
In reply to Ondrej ZaryMake saa7134 driver more V4L2 compliant: filter audio modes that came from tuner - keep only MONO/STEREO in radio mode
--- drivers/media/pci/saa7134/saa7134-video.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/pci/saa7134/saa7134-video.c +1 -0
@@ -2336,6 +2336,7 @@ static int radio_g_tuner(struct file *file, void *priv, t->type =V4L2_TUNER_RADIO ;saa_call_all (dev, tuner, g_tuner, t); + t->audmode &=V4L2_TUNER_MODE_MONO |V4L2_TUNER_MODE_STEREO ;if (dev->input->amux ==TV ) { t->signal =0xf800 - ((saa_readb (0x581 ) &0x1f ) <<11 ); t->rxsubchans = (saa_readb(0x529) & 0x08) ?
Signature · 1 line
Ondrej Zary
PATCH 3/8 saa7134: v4l2-compliance: use v4l2_fh to fix priority handling
In reply to Ondrej ZaryMake saa7134 driver more V4L2 compliant: remove broken priority handling and use v4l2_fh instead
--- drivers/media/pci/saa7134/saa7134-core.c | 3 +- drivers/media/pci/saa7134/saa7134-video.c | 61 +++------------------------- drivers/media/pci/saa7134/saa7134.h | 4 +- 3 files changed, 10 insertions(+), 58 deletions(-)
drivers/media/pci/saa7134/saa7134-core.c +1 -2
@@ -805,6 +805,7 @@ static struct video_device *vdev_init(struct saa7134_dev *dev, vfd->debug = video_debug;snprintf (vfd->name,sizeof (vfd->name),"%s %s (%s)" , dev->name, type, saa7134_boards[dev->board].name); +set_bit (V4L2_FL_USE_FH_PRIO , &vfd->flags);video_set_drvdata (vfd, dev);return vfd; }
@@ -1028,8 +1029,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, } } -v4l2_prio_init (&dev->prio); -mutex_lock (&saa7134_devlist_lock);list_for_each_entry (mops, &mops_list, next)mpeg_ops_attach (mops, dev);
drivers/media/pci/saa7134/saa7134-video.c +7 -54
128 lines not on this page · raw message
drivers/media/pci/saa7134/saa7134.h +2 -2
@@ -35,6 +35,7 @@#include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-device.h> +#include <media/v4l2-fh.h> #include <media/tuner.h> #include <media/rc-core.h> #include <media/ir-kbd-i2c.h>
@@ -466,11 +467,11 @@ struct saa7134_dmaqueue {/* video filehandle status */ struct saa7134_fh { +struct v4l2_fh fh;struct saa7134_dev *dev;unsigned int radio;enum v4l2_buf_type type;unsigned int resources; -enum v4l2_priority prio;/* video overlay */ struct v4l2_window win;
@@ -541,7 +542,6 @@ struct saa7134_dev {struct list_head devlist;struct mutex lock;spinlock_t slock; -struct v4l2_prio_state prio;struct v4l2_device v4l2_dev;/* workstruct for loading modules */ struct work_struct request_module_wk;
Signature · 1 line
Ondrej Zary
PATCH 4/8 saa7134: v4l2-compliance: return real frequency
In reply to Ondrej ZaryMake saa7134 driver more V4L2 compliant: don't cache frequency in s_frequency/g_frequency but return real one instead
--- drivers/media/pci/saa7134/saa7134-video.c | 6 ++++-- drivers/media/pci/saa7134/saa7134.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/media/pci/saa7134/saa7134-video.c +4 -2
@@ -2051,8 +2051,11 @@ static int saa7134_g_frequency(struct file *file, void *priv,struct saa7134_fh *fh = priv;struct saa7134_dev *dev = fh->dev; +if (0 != f->tuner) +return -EINVAL ; + f->type = fh->radio ?V4L2_TUNER_RADIO :V4L2_TUNER_ANALOG_TV ; - f->frequency = dev->ctl_freq; +saa_call_all (dev, tuner, g_frequency, f);return 0 ; }
@@ -2070,7 +2073,6 @@ static int saa7134_s_frequency(struct file *file, void *priv,if (1 == fh->radio &&V4L2_TUNER_RADIO != f->type)return -EINVAL ;mutex_lock (&dev->lock); - dev->ctl_freq = f->frequency;saa_call_all (dev, tuner, s_frequency, f);
drivers/media/pci/saa7134/saa7134.h +0 -1
@@ -604,7 +604,6 @@ struct saa7134_dev {int ctl_contrast;int ctl_hue;int ctl_saturation; -int ctl_freq;int ctl_mute;/* audio */ int ctl_volume;int ctl_invert;/* private */
Signature · 1 line
Ondrej Zary
PATCH 5/8 saa7134: v4l2-compliance: fix g_tuner/s_tuner
In reply to Ondrej ZaryMake saa7134 driver more V4L2 compliant: return real frequency range in g_tuner and fail in s_tuner for non-zero tuner
--- drivers/media/pci/saa7134/saa7134-video.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/media/pci/saa7134/saa7134-video.c +4 -1
@@ -2014,11 +2014,11 @@ static int saa7134_g_tuner(struct file *file, void *priv,if (NULL !=card_in (dev, n).name) {strcpy (t->name,"Television" ); t->type =V4L2_TUNER_ANALOG_TV ; +saa_call_all (dev, tuner, g_tuner, t); t->capability =V4L2_TUNER_CAP_NORM |V4L2_TUNER_CAP_STEREO |V4L2_TUNER_CAP_LANG1 |V4L2_TUNER_CAP_LANG2 ; - t->rangehigh =0xffffffffUL ; t->rxsubchans =saa7134_tvaudio_getstereo (dev); t->audmode =saa7134_tvaudio_rx2mode (t->rxsubchans); }
@@ -2034,6 +2034,9 @@ static int saa7134_s_tuner(struct file *file, void *priv,struct saa7134_dev *dev = fh->dev;int rx, mode; +if (0 != t->index) +return -EINVAL ; + mode = dev->thread.mode;if (UNSET == mode) { rx =saa7134_tvaudio_getstereo (dev);
Signature · 1 line
Ondrej Zary
PATCH 6/8 saa7134: v4l2-compliance: remove bogus audio input support
In reply to Ondrej ZaryMake saa7134 driver more V4L2 compliant: remove empty g_audio and s_audio functions and don't set audioset in enum_input
--- drivers/media/pci/saa7134/saa7134-video.c | 30 ----------------------------- 1 files changed, 0 insertions(+), 30 deletions(-)
drivers/media/pci/saa7134/saa7134-video.c +0 -30
@@ -1750,7 +1750,6 @@ static int saa7134_enum_input(struct file *file, void *priv,strcpy (i->name,card_in (dev, n).name);if (card_in (dev, n).tv) i->type =V4L2_INPUT_TYPE_TUNER ; - i->audioset =1 ;if (n == dev->ctl_input) {int v1 =saa_readb (SAA7134_STATUS_VIDEO1 );int v2 =saa_readb (SAA7134_STATUS_VIDEO2 );
@@ -2084,17 +2083,6 @@ static int saa7134_s_frequency(struct file *file, void *priv,return 0 ; } -static int saa7134_g_audio (struct file *file,void *priv,struct v4l2_audio *a) -{ -strcpy (a->name,"audio" ); -return 0 ; -} - -static int saa7134_s_audio (struct file *file,void *priv,const struct v4l2_audio *a) -{ -return 0 ; -} -static int saa7134_enum_fmt_vid_cap (struct file *file,void *priv,struct v4l2_fmtdesc *f) {
@@ -2335,20 +2323,6 @@ static int radio_g_input(struct file *filp, void *priv, unsigned int *i)return 0 ; } -static int radio_g_audio (struct file *file,void *priv, -struct v4l2_audio *a) -{ -memset (a,0 ,sizeof (*a)); -strcpy (a->name,"Radio" ); -return 0 ; -} - -static int radio_s_audio (struct file *file,void *priv, -const struct v4l2_audio *a) -{ -return 0 ; -} -static int radio_s_input (struct file *filp,void *priv,unsigned int i) {return 0 ;
@@ -2399,8 +2373,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { .vidioc_g_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap, .vidioc_try_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap, .vidioc_s_fmt_vbi_cap = saa7134_try_get_set_fmt_vbi_cap, - .vidioc_g_audio = saa7134_g_audio, - .vidioc_s_audio = saa7134_s_audio, .vidioc_cropcap = saa7134_cropcap, .vidioc_reqbufs = saa7134_reqbufs, .vidioc_querybuf = saa7134_querybuf,
@@ -2445,9 +2417,7 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = { .vidioc_querycap = saa7134_querycap, .vidioc_g_tuner = radio_g_tuner, .vidioc_enum_input = radio_enum_input, - .vidioc_g_audio = radio_g_audio, .vidioc_s_tuner = radio_s_tuner, - .vidioc_s_audio = radio_s_audio, .vidioc_s_input = radio_s_input, .vidioc_s_std = radio_s_std, .vidioc_queryctrl = radio_queryctrl,
Signature · 1 line
Ondrej Zary
PATCH 7/8 saa7134: v4l2-compliance: remove bogus g_parm
In reply to Ondrej ZaryMake saa7134 driver more V4L2 compliant: remove empty g_parm function
--- drivers/media/pci/saa7134/saa7134-video.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/media/pci/saa7134/saa7134-video.c +0 -7
@@ -2237,12 +2237,6 @@ static int saa7134_streamoff(struct file *file, void *priv,return 0 ; } -static int saa7134_g_parm (struct file *file,void *fh, -struct v4l2_streamparm *parm) -{ -return 0 ; -} -#ifdef CONFIG_VIDEO_ADV_DEBUG static int vidioc_g_register (struct file *file,void *priv,struct v4l2_dbg_register *reg)
@@ -2395,7 +2389,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { .vidioc_g_fbuf = saa7134_g_fbuf, .vidioc_s_fbuf = saa7134_s_fbuf, .vidioc_overlay = saa7134_overlay, - .vidioc_g_parm = saa7134_g_parm, .vidioc_g_frequency = saa7134_g_frequency, .vidioc_s_frequency = saa7134_s_frequency,#ifdef CONFIG_VIDEO_ADV_DEBUG
Signature · 1 line
Ondrej Zary
PATCH 8/8 saa7134: v4l2-compliance: clear reserved part of VBI structure
In reply to Ondrej ZaryMake saa7134 driver more V4L2 compliant: clear reserved space of VBI structure to make sure no garbage is left there
--- drivers/media/pci/saa7134/saa7134-video.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/pci/saa7134/saa7134-video.c +1 -0
@@ -1552,6 +1552,7 @@ static int saa7134_try_get_set_fmt_vbi_cap(struct file *file, void *priv,struct saa7134_dev *dev = fh->dev;struct saa7134_tvnorm *norm = dev->tvnorm; +memset (&f->fmt.vbi.reserved,0 ,sizeof (f->fmt.vbi.reserved)); f->fmt.vbi.sampling_rate =6750000 *4 ; f->fmt.vbi.samples_per_line =2048 /* VBI_LINE_LENGTH */ ; f->fmt.vbi.sample_format =V4L2_PIX_FMT_GREY ;
Signature · 1 line
Ondrej Zary