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

Commit 28718152 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] Move DV-class control IDs from videodev2.h to v4l2-controls.h 



When the control IDs were split off from videodev2.h to v4l2-controls.h
these new Digital Video controls were forgotten (the two patches may
have crossed one another).
Move these controls to their proper place in v4l2-controls.h.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 56bc911a

include/uapi/linux/v4l2-controls.h

+24 −0
Original line number Diff line number Diff line
@@ -778,6 +778,7 @@ enum v4l2_jpeg_chroma_subsampling { 
#define	V4L2_JPEG_ACTIVE_MARKER_DQT		(1 << 17)

#define	V4L2_JPEG_ACTIVE_MARKER_DHT		(1 << 18)





/* Image source controls */

#define V4L2_CID_IMAGE_SOURCE_CLASS_BASE	(V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)

#define V4L2_CID_IMAGE_SOURCE_CLASS		(V4L2_CTRL_CLASS_IMAGE_SOURCE | 1)
@@ -796,4 +797,27 @@ enum v4l2_jpeg_chroma_subsampling { 
#define V4L2_CID_PIXEL_RATE			(V4L2_CID_IMAGE_PROC_CLASS_BASE + 2)

#define V4L2_CID_TEST_PATTERN			(V4L2_CID_IMAGE_PROC_CLASS_BASE + 3)





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

#define V4L2_CID_DV_CLASS_BASE			(V4L2_CTRL_CLASS_DV | 0x900)

#define V4L2_CID_DV_CLASS			(V4L2_CTRL_CLASS_DV | 1)



#define	V4L2_CID_DV_TX_HOTPLUG			(V4L2_CID_DV_CLASS_BASE + 1)

#define	V4L2_CID_DV_TX_RXSENSE			(V4L2_CID_DV_CLASS_BASE + 2)

#define	V4L2_CID_DV_TX_EDID_PRESENT		(V4L2_CID_DV_CLASS_BASE + 3)

#define	V4L2_CID_DV_TX_MODE			(V4L2_CID_DV_CLASS_BASE + 4)

enum v4l2_dv_tx_mode {

	V4L2_DV_TX_MODE_DVI_D	= 0,

	V4L2_DV_TX_MODE_HDMI	= 1,

};

#define V4L2_CID_DV_TX_RGB_RANGE		(V4L2_CID_DV_CLASS_BASE + 5)

enum v4l2_dv_rgb_range {

	V4L2_DV_RGB_RANGE_AUTO	  = 0,

	V4L2_DV_RGB_RANGE_LIMITED = 1,

	V4L2_DV_RGB_RANGE_FULL	  = 2,

};



#define	V4L2_CID_DV_RX_POWER_PRESENT		(V4L2_CID_DV_CLASS_BASE + 100)

#define V4L2_CID_DV_RX_RGB_RANGE		(V4L2_CID_DV_CLASS_BASE + 101)



#endif

include/uapi/linux/videodev2.h

+0 −22
Original line number Diff line number Diff line
@@ -1354,28 +1354,6 @@ struct v4l2_querymenu { 
#define V4L2_CID_PRIVATE_BASE		0x08000000





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

#define V4L2_CID_DV_CLASS_BASE			(V4L2_CTRL_CLASS_DV | 0x900)

#define V4L2_CID_DV_CLASS			(V4L2_CTRL_CLASS_DV | 1)



#define	V4L2_CID_DV_TX_HOTPLUG			(V4L2_CID_DV_CLASS_BASE + 1)

#define	V4L2_CID_DV_TX_RXSENSE			(V4L2_CID_DV_CLASS_BASE + 2)

#define	V4L2_CID_DV_TX_EDID_PRESENT		(V4L2_CID_DV_CLASS_BASE + 3)

#define	V4L2_CID_DV_TX_MODE			(V4L2_CID_DV_CLASS_BASE + 4)

enum v4l2_dv_tx_mode {

	V4L2_DV_TX_MODE_DVI_D	= 0,

	V4L2_DV_TX_MODE_HDMI	= 1,

};

#define V4L2_CID_DV_TX_RGB_RANGE		(V4L2_CID_DV_CLASS_BASE + 5)

enum v4l2_dv_rgb_range {

	V4L2_DV_RGB_RANGE_AUTO	  = 0,

	V4L2_DV_RGB_RANGE_LIMITED = 1,

	V4L2_DV_RGB_RANGE_FULL	  = 2,

};



#define	V4L2_CID_DV_RX_POWER_PRESENT		(V4L2_CID_DV_CLASS_BASE + 100)

#define V4L2_CID_DV_RX_RGB_RANGE		(V4L2_CID_DV_CLASS_BASE + 101)



/*

 *	T U N I N G

 */