diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-05-28 08:27:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 07:07:22 -0300 |
| commit | b2de2313f170c3f7341d3a94365c5139a23067a7 (patch) | |
| tree | 6fc5d506b63ce937091d59232c6d5e507c5e0ad2 | |
| parent | 7bb846afceafdaceb88d2ed2e861585d26e353b9 (diff) | |
| download | linux-b2de2313f170c3f7341d3a94365c5139a23067a7.tar.bz2 | |
V4L/DVB (7947): videodev: add vidioc_g_std callback.
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/videodev.c | 12 | ||||
| -rw-r--r-- | include/media/v4l2-dev.h | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 91fd6cbc60ca..4d58b55095d7 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -1206,11 +1206,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/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 53b651ac685a..8a40f481d899 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -212,8 +212,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); |