aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2010-01-20 10:13:46 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:52:52 -0400
commit35a00c41ea8b280cb629503c735daf20cdf0f9f8 (patch)
treead4112545e8367a79a16685f39d743575e5566cd /drivers/media/video/uvc
parent48213fe3f981d2cbccd926d6858fa9cf8617beed (diff)
V4L/DVB: uvcvideo: Support iris absolute and relative controls
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
-rw-r--r--drivers/media/video/uvc/uvc_ctrl.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 6d3850b37161..5d6d7bda2336 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -562,6 +562,26 @@ static struct uvc_control_mapping uvc_ctrl_mappings[] = {
562 .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN, 562 .data_type = UVC_CTRL_DATA_TYPE_BOOLEAN,
563 }, 563 },
564 { 564 {
565 .id = V4L2_CID_IRIS_ABSOLUTE,
566 .name = "Iris, Absolute",
567 .entity = UVC_GUID_UVC_CAMERA,
568 .selector = UVC_CT_IRIS_ABSOLUTE_CONTROL,
569 .size = 16,
570 .offset = 0,
571 .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
572 .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
573 },
574 {
575 .id = V4L2_CID_IRIS_RELATIVE,
576 .name = "Iris, Relative",
577 .entity = UVC_GUID_UVC_CAMERA,
578 .selector = UVC_CT_IRIS_RELATIVE_CONTROL,
579 .size = 8,
580 .offset = 0,
581 .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
582 .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
583 },
584 {
565 .id = V4L2_CID_ZOOM_ABSOLUTE, 585 .id = V4L2_CID_ZOOM_ABSOLUTE,
566 .name = "Zoom, Absolute", 586 .name = "Zoom, Absolute",
567 .entity = UVC_GUID_UVC_CAMERA, 587 .entity = UVC_GUID_UVC_CAMERA,