summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/usb/uvc/uvc_ctrl.c174
1 files changed, 174 insertions, 0 deletions
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index b9a3d9257a11..b6e020b41671 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -385,6 +385,99 @@ static const struct uvc_control_info uvc_ctrls[] = {
| UVC_CTRL_FLAG_GET_RANGE
| UVC_CTRL_FLAG_RESTORE,
},
+ /*
+ * Allows the control of pan/tilt motor movements for camera models
+ * that support mechanical pan/tilt.
+ *
+ * Bits 0 to 15 control pan, bits 16 to 31 control tilt.
+ * The unit of the pan/tilt values is 1/64th of a degree and the
+ * resolution is 1 degree.
+ */
+ {
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 1,
+ .index = 0,
+ .size = 4,
+ .flags = UVC_CTRL_FLAG_GET_DEF
+ | UVC_CTRL_FLAG_GET_MAX
+ | UVC_CTRL_FLAG_GET_MIN
+ | UVC_CTRL_FLAG_SET_CUR,
+ },
+ /*
+ * Reset the pan/tilt motors to their original position for camera
+ * models that support mechanical pan/tilt.
+ *
+ * Setting bit 0 resets the pan position.
+ * Setting bit 1 resets the tilt position.
+ *
+ * Both bits can be set at the same time to reset both, pan and tilt,
+ * at the same time.
+ */
+ {
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 2,
+ .index = 1,
+ .size = 1,
+ .flags = UVC_CTRL_FLAG_GET_DEF
+ | UVC_CTRL_FLAG_GET_MAX
+ | UVC_CTRL_FLAG_GET_MIN
+ | UVC_CTRL_FLAG_SET_CUR,
+ },
+ /*
+ * Allows the control of focus motor movements for camera models that
+ * support mechanical focus.
+ *
+ * Bits 0 to 7 allow selection of the desired lens position.
+ * There are no physical units, instead, the focus range is spread over
+ * 256 logical units with 0 representing infinity focus and 255 being
+ * macro focus.
+ */
+ {
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 3,
+ .index = 2,
+ .size = 6,
+ .flags = UVC_CTRL_FLAG_GET_CUR
+ | UVC_CTRL_FLAG_GET_DEF
+ | UVC_CTRL_FLAG_GET_MAX
+ | UVC_CTRL_FLAG_GET_MIN
+ | UVC_CTRL_FLAG_SET_CUR,
+ },
+ /*
+ * Allows the control of pan/tilt motor movements for camera models
+ * that support mechanical pan/tilt.
+ *
+ * Bits 0 to 15 control pan, bits 16 to 31 control tilt.
+ */
+ {
+ .entity = UVC_GUID_LOGITECH_PERIPHERAL,
+ .selector = 1,
+ .index = 0,
+ .size = 4,
+ .flags = UVC_CTRL_FLAG_GET_DEF
+ | UVC_CTRL_FLAG_GET_MAX
+ | UVC_CTRL_FLAG_GET_MIN
+ | UVC_CTRL_FLAG_GET_RES
+ | UVC_CTRL_FLAG_SET_CUR,
+ },
+ /*
+ * Reset the pan/tilt motors to their original position for camera
+ * models that support mechanical pan/tilt.
+ *
+ * Setting bit 0 resets the pan position.
+ * Setting bit 1 resets the tilt position.
+ */
+ {
+ .entity = UVC_GUID_LOGITECH_PERIPHERAL,
+ .selector = 2,
+ .index = 1,
+ .size = 1,
+ .flags = UVC_CTRL_FLAG_GET_DEF
+ | UVC_CTRL_FLAG_GET_MAX
+ | UVC_CTRL_FLAG_GET_MIN
+ | UVC_CTRL_FLAG_GET_RES
+ | UVC_CTRL_FLAG_SET_CUR,
+ },
};
static const u32 uvc_control_classes[] = {
@@ -1009,6 +1102,87 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = {
.menu_mask = BIT(V4L2_COLORFX_VIVID) |
BIT(V4L2_COLORFX_NONE),
},
+ {
+ .id = V4L2_CID_PAN_RELATIVE,
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 1,
+ .size = 16,
+ .offset = 0,
+ .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
+ .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
+ },
+ {
+ .id = V4L2_CID_TILT_RELATIVE,
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 1,
+ .size = 16,
+ .offset = 16,
+ .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
+ .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
+ },
+ {
+ .id = V4L2_CID_PAN_RESET,
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 2,
+ .size = 1,
+ .offset = 0,
+ .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
+ .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+ },
+ {
+ .id = V4L2_CID_TILT_RESET,
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 2,
+ .size = 1,
+ .offset = 1,
+ .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
+ .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+ },
+ {
+ .id = V4L2_CID_PAN_RELATIVE,
+ .entity = UVC_GUID_LOGITECH_PERIPHERAL,
+ .selector = 1,
+ .size = 16,
+ .offset = 0,
+ .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
+ .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
+ },
+ {
+ .id = V4L2_CID_TILT_RELATIVE,
+ .entity = UVC_GUID_LOGITECH_PERIPHERAL,
+ .selector = 1,
+ .size = 16,
+ .offset = 16,
+ .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
+ .data_type = UVC_CTRL_DATA_TYPE_SIGNED,
+ },
+ {
+ .id = V4L2_CID_PAN_RESET,
+ .entity = UVC_GUID_LOGITECH_PERIPHERAL,
+ .selector = 2,
+ .size = 1,
+ .offset = 0,
+ .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
+ .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+ },
+ {
+ .id = V4L2_CID_TILT_RESET,
+ .entity = UVC_GUID_LOGITECH_PERIPHERAL,
+ .selector = 2,
+ .size = 1,
+ .offset = 1,
+ .v4l2_type = V4L2_CTRL_TYPE_BUTTON,
+ .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+ },
+ {
+ .id = V4L2_CID_FOCUS_ABSOLUTE,
+ .entity = UVC_GUID_LOGITECH_MOTOR_CONTROL_V1,
+ .selector = 3,
+ .size = 8,
+ .offset = 0,
+ .v4l2_type = V4L2_CTRL_TYPE_INTEGER,
+ .data_type = UVC_CTRL_DATA_TYPE_UNSIGNED,
+ },
};
/* ------------------------------------------------------------------------