Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 008d35f2 authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil@xs4all.nl>
Acked-by: default avatarAndy Walls <awalls@md.metrocast.net>
Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2a3b501f

Documentation/DocBook/v4l/controls.xml

+8 −1
Original line number Diff line number Diff line
@@ -311,11 +311,18 @@ minimum value disables backlight compensation.</entry> 
	    bits 8-15 Green color information, bits 16-23 Blue color

	    information and bits 24-31 must be zero.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_ILLUMINATORS_1</constant>

		<constant>V4L2_CID_ILLUMINATORS_2</constant></entry>

	    <entry>boolean</entry>

	    <entry>Switch on or off the illuminator 1 or 2 of the device

		(usually a microscope).</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_LASTP1</constant></entry>

	    <entry></entry>

	    <entry>End of the predefined control IDs (currently

<constant>V4L2_CID_BG_COLOR</constant> + 1).</entry>

<constant>V4L2_CID_ILLUMINATORS_2</constant> + 1).</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CID_PRIVATE_BASE</constant></entry>

drivers/media/video/v4l2-ctrls.c

+4 −0
Original line number Diff line number Diff line
@@ -305,6 +305,8 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_ROTATE:			return "Rotate";

	case V4L2_CID_BG_COLOR:			return "Background Color";

	case V4L2_CID_CHROMA_GAIN:		return "Chroma Gain";

	case V4L2_CID_ILLUMINATORS_1:		return "Illuminator 1";

	case V4L2_CID_ILLUMINATORS_2:		return "Illuminator 2";



	/* MPEG controls */

	/* 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, 
	case V4L2_CID_AUDIO_LIMITER_ENABLED:

	case V4L2_CID_AUDIO_COMPRESSION_ENABLED:

	case V4L2_CID_PILOT_TONE_ENABLED:

	case V4L2_CID_ILLUMINATORS_1:

	case V4L2_CID_ILLUMINATORS_2:

		*type = V4L2_CTRL_TYPE_BOOLEAN;

		*min = 0;

		*max = *step = 1;

include/linux/videodev2.h

+4 −1
Original line number Diff line number Diff line
@@ -1047,8 +1047,11 @@ enum v4l2_colorfx { 


#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)



#define V4L2_CID_ILLUMINATORS_1			(V4L2_CID_BASE+37)

#define V4L2_CID_ILLUMINATORS_2			(V4L2_CID_BASE+38)



/* last CID + 1 */

#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+37)

#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+39)



/*  MPEG-class control IDs defined by V4L2 */

#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)