diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-05-01 15:57:57 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 18:00:49 (GMT) |
| commit | ab49ae0f201f1e7e07250d011fffde8ed2530175 (patch) | |
| tree | 0fb1a572c621f44b3974c994b65e4a7ba9902201 /include/media | |
| parent | 537fa492e084af58d16899f8d0f3f3516a4fbe7c (diff) | |
| download | linux-ab49ae0f201f1e7e07250d011fffde8ed2530175.tar.xz | |
[media] saa7146: fix querycap, vbi/video separation and g/s_register
The querycap ioctl returned an incorrect version number and incorrect
capabilities (mixing up vbi and video caps).
The reason for that was that video nodes could do vbi activities: that
should be separated between the vbi and video nodes.
There were also a few minor problems with dbg_g/s_register that have
been resolved. The mxb/saa7146 driver now passes the v4l2_compliance tests.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/saa7146.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146_vv.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index c791940..773e527 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -18,8 +18,6 @@ #include <linux/vmalloc.h> /* for vmalloc() */ #include <linux/mm.h> /* for vmalloc_to_page() */ -#define SAA7146_VERSION_CODE 0x000600 /* 0.6.0 */ - #define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr))) #define saa7146_read(sxy,adr) readl(sxy->mem+(adr)) diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 2bbdf30..944ecdf 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -161,7 +161,8 @@ struct saa7146_ext_vv int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *); /* the extension can override this */ - struct v4l2_ioctl_ops ops; + struct v4l2_ioctl_ops vid_ops; + struct v4l2_ioctl_ops vbi_ops; /* pointer to the saa7146 core ops */ const struct v4l2_ioctl_ops *core_ops; @@ -200,6 +201,7 @@ void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data); /* from saa7146_video.c */ extern const struct v4l2_ioctl_ops saa7146_video_ioctl_ops; +extern const struct v4l2_ioctl_ops saa7146_vbi_ioctl_ops; extern struct saa7146_use_ops saa7146_video_uops; int saa7146_start_preview(struct saa7146_fh *fh); int saa7146_stop_preview(struct saa7146_fh *fh); |