Commit 5e26d50f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9035): uvcvideo: Declare missing camera and processing unit controls. 



This declares all missing UVC camera and processing unit controls. V4L2
mappings are not supported yet for those controls.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4aaec3ea

drivers/media/video/uvc/uvc_ctrl.c

+145 −19
Original line number Diff line number Diff line
@@ -81,6 +81,22 @@ static struct uvc_control_info uvc_ctrls[] = { 
		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_TEMPERATURE_CONTROL,

		.index		= 6,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_COMPONENT_CONTROL,

		.index		= 7,

		.size		= 4,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_BACKLIGHT_COMPENSATION_CONTROL,
@@ -113,6 +129,60 @@ static struct uvc_control_info uvc_ctrls[] = { 
		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,

		.index		= 12,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,

		.index		= 13,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_DIGITAL_MULTIPLIER_CONTROL,

		.index		= 14,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_DIGITAL_MULTIPLIER_LIMIT_CONTROL,

		.index		= 15,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_ANALOG_VIDEO_STANDARD_CONTROL,

		.index		= 16,

		.size		= 1,

		.flags		= UVC_CONTROL_GET_CUR,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_ANALOG_LOCK_STATUS_CONTROL,

		.index		= 17,

		.size		= 1,

		.flags		= UVC_CONTROL_GET_CUR,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_SCANNING_MODE_CONTROL,

		.index		= 0,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_AE_MODE_CONTROL,
@@ -138,6 +208,14 @@ static struct uvc_control_info uvc_ctrls[] = { 
		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_EXPOSURE_TIME_RELATIVE_CONTROL,

		.index		= 4,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_FOCUS_ABSOLUTE_CONTROL,
@@ -148,42 +226,90 @@ static struct uvc_control_info uvc_ctrls[] = { 
	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_FOCUS_AUTO_CONTROL,

		.index		= 17,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,

		.selector	= CT_FOCUS_RELATIVE_CONTROL,

		.index		= 6,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_TEMPERATURE_AUTO_CONTROL,

		.index		= 12,

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_IRIS_ABSOLUTE_CONTROL,

		.index		= 7,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_IRIS_RELATIVE_CONTROL,

		.index		= 8,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,

				| UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_TEMPERATURE_CONTROL,

		.index		= 6,

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_ZOOM_ABSOLUTE_CONTROL,

		.index		= 9,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_COMPONENT_AUTO_CONTROL,

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_ZOOM_RELATIVE_CONTROL,

		.index		= 10,

		.size		= 3,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_PANTILT_ABSOLUTE_CONTROL,

		.index		= 11,

		.size		= 8,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_PANTILT_RELATIVE_CONTROL,

		.index		= 12,

		.size		= 4,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_ROLL_ABSOLUTE_CONTROL,

		.index		= 13,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_ROLL_RELATIVE_CONTROL,

		.index		= 14,

		.size		= 2,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

				| UVC_CONTROL_AUTO_UPDATE,

	},

	{

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_FOCUS_AUTO_CONTROL,

		.index		= 17,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,

	},

	{

		.entity		= UVC_GUID_UVC_PROCESSING,

		.selector	= PU_WHITE_BALANCE_COMPONENT_CONTROL,

		.index		= 7,

		.size		= 4,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE

		.entity		= UVC_GUID_UVC_CAMERA,

		.selector	= CT_PRIVACY_CONTROL,

		.index		= 18,

		.size		= 1,

		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR

				| UVC_CONTROL_RESTORE | UVC_CONTROL_AUTO_UPDATE,

	},

};