History

[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).

Ricardo Ribalda committed 11 years ago

Commit 0f8017b1 parent 35ec2a27 files · +32 −27Browse files

Showing the changes to include/uapi (1 of 7 files). Show all

Unified · Split

include/uapi/linux/videodev2.h+5−0
@@ -1477,7 +1477,9 @@ struct v4l2_ext_control { · 1476 unmodified lines
1477 1477
1478struct v4l2_ext_controls {1478struct v4l2_ext_controls {
1479 union {1479 union {
1480#ifndef __KERNEL__
1480 __u32 ctrl_class;1481 __u32 ctrl_class;
1482#endif
1481 __u32 which;1483 __u32 which;
1482 };1484 };
1483 __u32 count;1485 __u32 count;
@@ -1487,7 +1489,10 @@ struct v4l2_ext_controls { · 3 unmodified lines
1487};1489};
1488 1490
1489#define V4L2_CTRL_ID_MASK (0x0fffffff)1491#define V4L2_CTRL_ID_MASK (0x0fffffff)
1492#ifndef __KERNEL__
1490#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL)1493#define V4L2_CTRL_ID2CLASS(id) ((id) & 0x0fff0000UL)
1494#endif
1495#define V4L2_CTRL_ID2WHICH(id) ((id) & 0x0fff0000UL)
1491#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)1496#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
1492#define V4L2_CTRL_MAX_DIMS (4)1497#define V4L2_CTRL_MAX_DIMS (4)
1493#define V4L2_CTRL_WHICH_CUR_VAL 01498#define V4L2_CTRL_WHICH_CUR_VAL 0

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t