|
@@ -160,16 +160,6 @@ enum v4l2_buf_type {
|
|
|
V4L2_BUF_TYPE_PRIVATE = 0x80,
|
|
|
};
|
|
|
|
|
|
-enum v4l2_ctrl_type {
|
|
|
- V4L2_CTRL_TYPE_INTEGER = 1,
|
|
|
- V4L2_CTRL_TYPE_BOOLEAN = 2,
|
|
|
- V4L2_CTRL_TYPE_MENU = 3,
|
|
|
- V4L2_CTRL_TYPE_BUTTON = 4,
|
|
|
- V4L2_CTRL_TYPE_INTEGER64 = 5,
|
|
|
- V4L2_CTRL_TYPE_CTRL_CLASS = 6,
|
|
|
- V4L2_CTRL_TYPE_STRING = 7,
|
|
|
-};
|
|
|
-
|
|
|
enum v4l2_tuner_type {
|
|
|
V4L2_TUNER_RADIO = 1,
|
|
|
V4L2_TUNER_ANALOG_TV = 2,
|
|
@@ -942,6 +932,16 @@ struct v4l2_ext_controls {
|
|
|
#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL)
|
|
|
#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
|
|
|
|
|
|
+enum v4l2_ctrl_type {
|
|
|
+ V4L2_CTRL_TYPE_INTEGER = 1,
|
|
|
+ V4L2_CTRL_TYPE_BOOLEAN = 2,
|
|
|
+ V4L2_CTRL_TYPE_MENU = 3,
|
|
|
+ V4L2_CTRL_TYPE_BUTTON = 4,
|
|
|
+ V4L2_CTRL_TYPE_INTEGER64 = 5,
|
|
|
+ V4L2_CTRL_TYPE_CTRL_CLASS = 6,
|
|
|
+ V4L2_CTRL_TYPE_STRING = 7,
|
|
|
+};
|
|
|
+
|
|
|
/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
|
|
|
struct v4l2_queryctrl {
|
|
|
__u32 id;
|