diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-01-11 04:45:05 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-23 13:34:27 -0500 |
commit | 583aa3a9b5ca846a84f7dd87bdc4b75dca07b011 (patch) | |
tree | a86d9d5f2e9817e9faf9d2e06d212d4380924fe9 /drivers/media/video/v4l2-ioctl.c | |
parent | 93596ef7db3e9bcc9306c3e93cf28ce1048858b6 (diff) |
[media] V4L2: Add per-device-node capabilities
If V4L2_CAP_DEVICE_CAPS is set, then the new device_caps field is filled with
the capabilities of the opened device node.
The capabilities field traditionally contains the capabilities of the physical
device, being a superset of all capabilities available at the several device
nodes. E.g., if you open /dev/video0, then if it contains VBI caps then that means
that there is a corresponding vbi node as well. And the capabilities field of
both the video and vbi nodes should contain identical caps.
However, it would be very useful to also have a capabilities field that contains
just the caps for the currently open device, hence the new CAP bit and field.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
-rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 3f623859a337..d0d7281e01e0 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
@@ -540,10 +540,12 @@ static long __video_do_ioctl(struct file *file, | |||
540 | if (!ret) | 540 | if (!ret) |
541 | dbgarg(cmd, "driver=%s, card=%s, bus=%s, " | 541 | dbgarg(cmd, "driver=%s, card=%s, bus=%s, " |
542 | "version=0x%08x, " | 542 | "version=0x%08x, " |
543 | "capabilities=0x%08x\n", | 543 | "capabilities=0x%08x, " |
544 | "device_caps=0x%08x\n", | ||
544 | cap->driver, cap->card, cap->bus_info, | 545 | cap->driver, cap->card, cap->bus_info, |
545 | cap->version, | 546 | cap->version, |
546 | cap->capabilities); | 547 | cap->capabilities, |
548 | cap->device_caps); | ||
547 | break; | 549 | break; |
548 | } | 550 | } |
549 | 551 | ||