diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-28 10:27:00 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-28 10:27:00 +0200 |
| commit | db9c8e1db5a3ac5b6012c4371bcf3b1a00190d0e (patch) | |
| tree | d0d8d1a87c01bd9cd095fa8c4cd3560af93d187f | |
| parent | 4c4ffaaff72aa78fdd1b96d73fe1eb265b5f2d07 (diff) | |
| download | mediapointer-dvb-s2-db9c8e1db5a3ac5b6012c4371bcf3b1a00190d0e.tar.gz mediapointer-dvb-s2-db9c8e1db5a3ac5b6012c4371bcf3b1a00190d0e.tar.bz2 | |
videodev: add vidioc_g_std callback.
From: Hans Verkuil <hverkuil@xs4all.nl>
The default videodev behavior for VIDIOC_G_STD is not correct for all devices.
Add a new callback that drivers can use instead.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 12 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index b2291e085..4f04a1260 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -1348,11 +1348,15 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, { v4l2_std_id *id = arg; - *id = vfd->current_norm; - - dbgarg (cmd, "value=%08Lx\n", (long long unsigned) *id); + ret = 0; + /* Calls the specific handler */ + if (vfd->vidioc_g_std) + ret = vfd->vidioc_g_std(file, fh, id); + else + *id = vfd->current_norm; - ret=0; + if (!ret) + dbgarg(cmd, "value=%08Lx\n", (long long unsigned)*id); break; } case VIDIOC_S_STD: diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 2b4577abb..d1ccd701e 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -228,8 +228,9 @@ struct video_device int (*vidioc_streamoff)(struct file *file, void *fh, enum v4l2_buf_type i); /* Standard handling - G_STD and ENUMSTD are handled by videodev.c + ENUMSTD is handled by videodev.c */ + int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm); int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id *norm); int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a); |