aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/v4l2-ctrls.c
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-09-13 06:04:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:05:54 -0400
commit008d35f2f5256751a18f1f4aea79e3caf140098d (patch)
treedb88373c477e246846349e5ac6b79050edf6c28e /drivers/media/video/v4l2-ctrls.c
parent2a3b501ffd28b2be355f558479543028ccdead48 (diff)
V4L/DVB: v4l2: Add illuminator controls
Some media devices (microscopes) may have one or many illuminators. This patch makes them controlable by the applications. Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-ctrls.c')
-rw-r--r--drivers/media/video/v4l2-ctrls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c
index ea8d32cd425d..9d2502cd03ff 100644
--- a/drivers/media/video/v4l2-ctrls.c
+++ b/drivers/media/video/v4l2-ctrls.c
@@ -305,6 +305,8 @@ const char *v4l2_ctrl_get_name(u32 id)
305 case V4L2_CID_ROTATE: return "Rotate"; 305 case V4L2_CID_ROTATE: return "Rotate";
306 case V4L2_CID_BG_COLOR: return "Background Color"; 306 case V4L2_CID_BG_COLOR: return "Background Color";
307 case V4L2_CID_CHROMA_GAIN: return "Chroma Gain"; 307 case V4L2_CID_CHROMA_GAIN: return "Chroma Gain";
308 case V4L2_CID_ILLUMINATORS_1: return "Illuminator 1";
309 case V4L2_CID_ILLUMINATORS_2: return "Illuminator 2";
308 310
309 /* MPEG controls */ 311 /* MPEG controls */
310 /* Keep the order of the 'case's the same as in videodev2.h! */ 312 /* Keep the order of the 'case's the same as in videodev2.h! */
@@ -419,6 +421,8 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
419 case V4L2_CID_AUDIO_LIMITER_ENABLED: 421 case V4L2_CID_AUDIO_LIMITER_ENABLED:
420 case V4L2_CID_AUDIO_COMPRESSION_ENABLED: 422 case V4L2_CID_AUDIO_COMPRESSION_ENABLED:
421 case V4L2_CID_PILOT_TONE_ENABLED: 423 case V4L2_CID_PILOT_TONE_ENABLED:
424 case V4L2_CID_ILLUMINATORS_1:
425 case V4L2_CID_ILLUMINATORS_2:
422 *type = V4L2_CTRL_TYPE_BOOLEAN; 426 *type = V4L2_CTRL_TYPE_BOOLEAN;
423 *min = 0; 427 *min = 0;
424 *max = *step = 1; 428 *max = *step = 1;