diff options
| -rw-r--r-- | sys/dev/usb/uvideo.c | 3 | ||||
| -rw-r--r-- | sys/dev/video.c | 7 | ||||
| -rw-r--r-- | sys/dev/video_if.h | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index b1e1295037e..2b073310c43 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.30 2008/06/10 06:08:22 mglocker Exp $ */ +/* $OpenBSD: uvideo.c,v 1.31 2008/06/10 23:39:01 robert Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -189,6 +189,7 @@ struct video_hw_if uvideo_hw_if = { uvideo_dqbuf, /* VIDIOC_DQBUF */ uvideo_streamon, /* VIDIOC_STREAMON */ uvideo_try_fmt, /* VIDIOC_TRY_FMT */ + NULL, /* VIDIOC_QUERYCTRL */ uvideo_mappage, /* mmap */ uvideo_get_bufsize, /* read */ uvideo_start_read /* start stream for read */ diff --git a/sys/dev/video.c b/sys/dev/video.c index 5eaf008d9c4..a6ec1a54b91 100644 --- a/sys/dev/video.c +++ b/sys/dev/video.c @@ -1,4 +1,4 @@ -/* $OpenBSD: video.c,v 1.10 2008/06/09 20:51:31 mglocker Exp $ */ +/* $OpenBSD: video.c,v 1.11 2008/06/10 23:39:01 robert Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> * @@ -233,6 +233,11 @@ videoioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p) error = (sc->hw_if->try_fmt)(sc->hw_hdl, (struct v4l2_format *)data); break; + case VIDIOC_QUERYCTRL: + if (sc->hw_if->queryctrl) + error = (sc->hw_if->queryctrl)(sc->hw_hdl, + (struct v4l2_queryctrl *)data); + break; default: error = (ENOTTY); } diff --git a/sys/dev/video_if.h b/sys/dev/video_if.h index c843ce09edd..d096d8c3245 100644 --- a/sys/dev/video_if.h +++ b/sys/dev/video_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: video_if.h,v 1.10 2008/06/09 20:51:31 mglocker Exp $ */ +/* $OpenBSD: video_if.h,v 1.11 2008/06/10 23:39:01 robert Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> * @@ -45,6 +45,7 @@ struct video_hw_if { int (*dqbuf)(void *, struct v4l2_buffer *); int (*streamon)(void *, int); int (*try_fmt)(void *, struct v4l2_format *); + int (*queryctrl)(void *, struct v4l2_queryctrl *); caddr_t (*mappage)(void *, off_t, int); /* other functions */ |