mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
[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 <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
This commit is contained in:
parent
537fa492e0
commit
ab49ae0f20
9 changed files with 92 additions and 46 deletions
|
|
@ -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))
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue