diff options
Diffstat (limited to 'include/linux/videodev2.h')
-rw-r--r-- | include/linux/videodev2.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 2559b182b8c4..65d13ec13c1f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -160,16 +160,6 @@ enum v4l2_buf_type { | |||
160 | V4L2_BUF_TYPE_PRIVATE = 0x80, | 160 | V4L2_BUF_TYPE_PRIVATE = 0x80, |
161 | }; | 161 | }; |
162 | 162 | ||
163 | enum v4l2_ctrl_type { | ||
164 | V4L2_CTRL_TYPE_INTEGER = 1, | ||
165 | V4L2_CTRL_TYPE_BOOLEAN = 2, | ||
166 | V4L2_CTRL_TYPE_MENU = 3, | ||
167 | V4L2_CTRL_TYPE_BUTTON = 4, | ||
168 | V4L2_CTRL_TYPE_INTEGER64 = 5, | ||
169 | V4L2_CTRL_TYPE_CTRL_CLASS = 6, | ||
170 | V4L2_CTRL_TYPE_STRING = 7, | ||
171 | }; | ||
172 | |||
173 | enum v4l2_tuner_type { | 163 | enum v4l2_tuner_type { |
174 | V4L2_TUNER_RADIO = 1, | 164 | V4L2_TUNER_RADIO = 1, |
175 | V4L2_TUNER_ANALOG_TV = 2, | 165 | V4L2_TUNER_ANALOG_TV = 2, |
@@ -942,6 +932,16 @@ struct v4l2_ext_controls { | |||
942 | #define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) | 932 | #define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) |
943 | #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) | 933 | #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) |
944 | 934 | ||
935 | enum v4l2_ctrl_type { | ||
936 | V4L2_CTRL_TYPE_INTEGER = 1, | ||
937 | V4L2_CTRL_TYPE_BOOLEAN = 2, | ||
938 | V4L2_CTRL_TYPE_MENU = 3, | ||
939 | V4L2_CTRL_TYPE_BUTTON = 4, | ||
940 | V4L2_CTRL_TYPE_INTEGER64 = 5, | ||
941 | V4L2_CTRL_TYPE_CTRL_CLASS = 6, | ||
942 | V4L2_CTRL_TYPE_STRING = 7, | ||
943 | }; | ||
944 | |||
945 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ | 945 | /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ |
946 | struct v4l2_queryctrl { | 946 | struct v4l2_queryctrl { |
947 | __u32 id; | 947 | __u32 id; |