aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-ctrls.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 13fe4d744aba..bd6a4a7370df 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -65,10 +65,6 @@ struct v4l2_ctrl_ops {
65 * @is_private: If set, then this control is private to its handler and it 65 * @is_private: If set, then this control is private to its handler and it
66 * will not be added to any other handlers. Drivers can set 66 * will not be added to any other handlers. Drivers can set
67 * this flag. 67 * this flag.
68 * @is_volatile: If set, then this control is volatile. This means that the
69 * control's current value cannot be cached and needs to be
70 * retrieved through the g_volatile_ctrl op. Drivers can set
71 * this flag.
72 * @is_auto: If set, then this control selects whether the other cluster 68 * @is_auto: If set, then this control selects whether the other cluster
73 * members are in 'automatic' mode or 'manual' mode. This is 69 * members are in 'automatic' mode or 'manual' mode. This is
74 * used for autogain/gain type clusters. Drivers should never 70 * used for autogain/gain type clusters. Drivers should never
@@ -118,7 +114,6 @@ struct v4l2_ctrl {
118 114
119 unsigned int is_new:1; 115 unsigned int is_new:1;
120 unsigned int is_private:1; 116 unsigned int is_private:1;
121 unsigned int is_volatile:1;
122 unsigned int is_auto:1; 117 unsigned int is_auto:1;
123 unsigned int manual_mode_value:8; 118 unsigned int manual_mode_value:8;
124 119
@@ -208,9 +203,6 @@ struct v4l2_ctrl_handler {
208 * must be NULL. 203 * must be NULL.
209 * @is_private: If set, then this control is private to its handler and it 204 * @is_private: If set, then this control is private to its handler and it
210 * will not be added to any other handlers. 205 * will not be added to any other handlers.
211 * @is_volatile: If set, then this control is volatile. This means that the
212 * control's current value cannot be cached and needs to be
213 * retrieved through the g_volatile_ctrl op.
214 */ 206 */
215struct v4l2_ctrl_config { 207struct v4l2_ctrl_config {
216 const struct v4l2_ctrl_ops *ops; 208 const struct v4l2_ctrl_ops *ops;
@@ -225,7 +217,6 @@ struct v4l2_ctrl_config {
225 u32 menu_skip_mask; 217 u32 menu_skip_mask;
226 const char * const *qmenu; 218 const char * const *qmenu;
227 unsigned int is_private:1; 219 unsigned int is_private:1;
228 unsigned int is_volatile:1;
229}; 220};
230 221
231/** v4l2_ctrl_fill() - Fill in the control fields based on the control ID. 222/** v4l2_ctrl_fill() - Fill in the control fields based on the control ID.
@@ -389,8 +380,7 @@ void v4l2_ctrl_cluster(unsigned ncontrols, struct v4l2_ctrl **controls);
389 * @manual_val: The value for the first control in the cluster that equals the 380 * @manual_val: The value for the first control in the cluster that equals the
390 * manual setting. 381 * manual setting.
391 * @set_volatile: If true, then all controls except the first auto control will 382 * @set_volatile: If true, then all controls except the first auto control will
392 * have is_volatile set to true. If false, then is_volatile will not 383 * be volatile.
393 * be touched.
394 * 384 *
395 * Use for control groups where one control selects some automatic feature and 385 * Use for control groups where one control selects some automatic feature and
396 * the other controls are only active whenever the automatic feature is turned 386 * the other controls are only active whenever the automatic feature is turned