aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-common.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2010-01-20 10:12:57 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:52:51 -0400
commit48213fe3f981d2cbccd926d6858fa9cf8617beed (patch)
treee0d7b046c576f5cf1914a0486194d8ac8ff4c730 /drivers/media/video/v4l2-common.c
parentf129b03ba272c86c42ad476684caa0d6109cb383 (diff)
V4L/DVB: v4l: Add V4L2_CID_IRIS_ABSOLUTE and V4L2_CID_IRIS_RELATIVE controls
Those control, as their names imply, control the camera aperture settings. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-common.c')
-rw-r--r--drivers/media/video/v4l2-common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index cd1f21d9b079..67944f53a79a 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -489,6 +489,8 @@ const char *v4l2_ctrl_get_name(u32 id)
489 case V4L2_CID_FOCUS_ABSOLUTE: return "Focus, Absolute"; 489 case V4L2_CID_FOCUS_ABSOLUTE: return "Focus, Absolute";
490 case V4L2_CID_FOCUS_RELATIVE: return "Focus, Relative"; 490 case V4L2_CID_FOCUS_RELATIVE: return "Focus, Relative";
491 case V4L2_CID_FOCUS_AUTO: return "Focus, Automatic"; 491 case V4L2_CID_FOCUS_AUTO: return "Focus, Automatic";
492 case V4L2_CID_IRIS_ABSOLUTE: return "Iris, Absolute";
493 case V4L2_CID_IRIS_RELATIVE: return "Iris, Relative";
492 case V4L2_CID_ZOOM_ABSOLUTE: return "Zoom, Absolute"; 494 case V4L2_CID_ZOOM_ABSOLUTE: return "Zoom, Absolute";
493 case V4L2_CID_ZOOM_RELATIVE: return "Zoom, Relative"; 495 case V4L2_CID_ZOOM_RELATIVE: return "Zoom, Relative";
494 case V4L2_CID_ZOOM_CONTINUOUS: return "Zoom, Continuous"; 496 case V4L2_CID_ZOOM_CONTINUOUS: return "Zoom, Continuous";
@@ -643,6 +645,7 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 ste
643 case V4L2_CID_PAN_RELATIVE: 645 case V4L2_CID_PAN_RELATIVE:
644 case V4L2_CID_TILT_RELATIVE: 646 case V4L2_CID_TILT_RELATIVE:
645 case V4L2_CID_FOCUS_RELATIVE: 647 case V4L2_CID_FOCUS_RELATIVE:
648 case V4L2_CID_IRIS_RELATIVE:
646 case V4L2_CID_ZOOM_RELATIVE: 649 case V4L2_CID_ZOOM_RELATIVE:
647 qctrl->flags |= V4L2_CTRL_FLAG_WRITE_ONLY; 650 qctrl->flags |= V4L2_CTRL_FLAG_WRITE_ONLY;
648 break; 651 break;