diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-06-10 06:55:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 10:57:18 -0400 |
commit | 998e7659150760c0f4871ee20de2ef2276e3f80a (patch) | |
tree | 3f46982463b3ea8e68ac9d74b7f32cfd2aa068d5 /include/media/v4l2-ctrls.h | |
parent | 20d88eef66a86989ea3cffe2a4e0d16cbf2d4563 (diff) |
[media] v4l2-ctrls: prepare for array support
Add core support for N-dimensional arrays.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media/v4l2-ctrls.h')
-rw-r--r-- | include/media/v4l2-ctrls.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index d30da09b7b69..7915b1125bb5 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h | |||
@@ -74,13 +74,13 @@ struct v4l2_ctrl_ops { | |||
74 | * @validate: validate the value. Return 0 on success and a negative value otherwise. | 74 | * @validate: validate the value. Return 0 on success and a negative value otherwise. |
75 | */ | 75 | */ |
76 | struct v4l2_ctrl_type_ops { | 76 | struct v4l2_ctrl_type_ops { |
77 | bool (*equal)(const struct v4l2_ctrl *ctrl, | 77 | bool (*equal)(const struct v4l2_ctrl *ctrl, u32 idx, |
78 | union v4l2_ctrl_ptr ptr1, | 78 | union v4l2_ctrl_ptr ptr1, |
79 | union v4l2_ctrl_ptr ptr2); | 79 | union v4l2_ctrl_ptr ptr2); |
80 | void (*init)(const struct v4l2_ctrl *ctrl, | 80 | void (*init)(const struct v4l2_ctrl *ctrl, u32 idx, |
81 | union v4l2_ctrl_ptr ptr); | 81 | union v4l2_ctrl_ptr ptr); |
82 | void (*log)(const struct v4l2_ctrl *ctrl); | 82 | void (*log)(const struct v4l2_ctrl *ctrl); |
83 | int (*validate)(const struct v4l2_ctrl *ctrl, | 83 | int (*validate)(const struct v4l2_ctrl *ctrl, u32 idx, |
84 | union v4l2_ctrl_ptr ptr); | 84 | union v4l2_ctrl_ptr ptr); |
85 | }; | 85 | }; |
86 | 86 | ||
@@ -111,6 +111,7 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv); | |||
111 | * @is_ptr: If set, then this control is an array and/or has type >= V4L2_CTRL_COMPOUND_TYPES | 111 | * @is_ptr: If set, then this control is an array and/or has type >= V4L2_CTRL_COMPOUND_TYPES |
112 | * and/or has type V4L2_CTRL_TYPE_STRING. In other words, struct | 112 | * and/or has type V4L2_CTRL_TYPE_STRING. In other words, struct |
113 | * v4l2_ext_control uses field p to point to the data. | 113 | * v4l2_ext_control uses field p to point to the data. |
114 | * @is_array: If set, then this control contains an N-dimensional array. | ||
114 | * @has_volatiles: If set, then one or more members of the cluster are volatile. | 115 | * @has_volatiles: If set, then one or more members of the cluster are volatile. |
115 | * Drivers should never touch this flag. | 116 | * Drivers should never touch this flag. |
116 | * @call_notify: If set, then call the handler's notify function whenever the | 117 | * @call_notify: If set, then call the handler's notify function whenever the |
@@ -169,6 +170,7 @@ struct v4l2_ctrl { | |||
169 | unsigned int is_int:1; | 170 | unsigned int is_int:1; |
170 | unsigned int is_string:1; | 171 | unsigned int is_string:1; |
171 | unsigned int is_ptr:1; | 172 | unsigned int is_ptr:1; |
173 | unsigned int is_array:1; | ||
172 | unsigned int has_volatiles:1; | 174 | unsigned int has_volatiles:1; |
173 | unsigned int call_notify:1; | 175 | unsigned int call_notify:1; |
174 | unsigned int manual_mode_value:8; | 176 | unsigned int manual_mode_value:8; |