diff options
| author | Ricardo Ribalda <ricardo.ribalda@gmail.com> | 2015-10-29 08:10:28 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-11-17 14:44:03 -0200 |
| commit | 0f8017bebf3efd3dcb115bf8a3f883b3123019ee (patch) | |
| tree | a5a8531118bddbfdfea79422df95286adf00a653 /include | |
| parent | 35ec2a2fa5a362b07b590ae1568dc35e47a7b846 (diff) | |
| download | linux-stable-0f8017bebf3efd3dcb115bf8a3f883b3123019ee.tar.gz linux-stable-0f8017bebf3efd3dcb115bf8a3f883b3123019ee.tar.bz2 linux-stable-0f8017bebf3efd3dcb115bf8a3f883b3123019ee.zip | |
[media] media/core: Replace ctrl_class with which
Replace the obsolete field ctrl_class with "which".
Make sure it not used in future modules by commenting out the field with
ifndef __KERNEL_ .
The field cannot be simply removed because that would be change on the
kenel API to the userspace (and we don't like that).
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/videodev2.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 4d88ee2d268e..bd2dc9431ac1 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1477,7 +1477,9 @@ struct v4l2_ext_control { struct v4l2_ext_controls { union { +#ifndef __KERNEL__ __u32 ctrl_class; +#endif __u32 which; }; __u32 count; @@ -1487,7 +1489,10 @@ struct v4l2_ext_controls { }; #define V4L2_CTRL_ID_MASK (0x0fffffff) +#ifndef __KERNEL__ #define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL) +#endif +#define V4L2_CTRL_ID2WHICH(id) ((id) & 0x0fff0000UL) #define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000) #define V4L2_CTRL_MAX_DIMS (4) #define V4L2_CTRL_WHICH_CUR_VAL 0 |