Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.
Showing the changes to include/uapi/linux (2 of 274 files). Show all
Unified · Split
| @@ -716,7 +716,6 @@ · 715 unmodified lines | ||
| 716 | 716 | * the situation described above. |
| 717 | 717 | */ |
| 718 | 718 | #define REL_RESERVED 0x0a |
| 719 | −#define REL_WHEEL_HI_RES 0x0b | |
| 720 | 719 | #define REL_MAX 0x0f |
| 721 | 720 | #define REL_CNT (REL_MAX+1) |
| 722 | 721 | |
| @@ -753,15 +752,6 @@ · 30 unmodified lines | ||
| 753 | 752 | |
| 754 | 753 | #define ABS_MISC 0x28 |
| 755 | 754 | |
| 756 | −/* | |
| 757 | − * 0x2e is reserved and should not be used in input drivers. | |
| 758 | − * It was used by HID as ABS_MISC+6 and userspace needs to detect if | |
| 759 | − * the next ABS_* event is correct or is just ABS_MISC + n. | |
| 760 | − * We define here ABS_RESERVED so userspace can rely on it and detect | |
| 761 | − * the situation described above. | |
| 762 | − */ | |
| 763 | −#define ABS_RESERVED 0x2e | |
| 764 | − | |
| 765 | 755 | #define ABS_MT_SLOT 0x2f /* MT slot being modified */ |
| 766 | 756 | #define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ |
| 767 | 757 | #define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ |
| @@ -50,6 +50,8 @@ · 49 unmodified lines | ||
| 50 | 50 | #ifndef __LINUX_V4L2_CONTROLS_H |
| 51 | 51 | #define __LINUX_V4L2_CONTROLS_H |
| 52 | 52 | |
| 53 | +#include <linux/types.h> | |
| 54 | + | |
| 53 | 55 | /* Control classes */ |
| 54 | 56 | #define V4L2_CTRL_CLASS_USER 0x00980000 /* Old-style 'user' controls */ |
| 55 | 57 | #define V4L2_CTRL_CLASS_MPEG 0x00990000 /* MPEG-compression controls */ |
| @@ -1110,6 +1112,7 @@ struct v4l2_mpeg2_sequence { · 1054 unmodified lines | ||
| 1110 | 1112 | __u8 profile_and_level_indication; |
| 1111 | 1113 | __u8 progressive_sequence; |
| 1112 | 1114 | __u8 chroma_format; |
| 1115 | + __u8 pad; | |
| 1113 | 1116 | }; |
| 1114 | 1117 | |
| 1115 | 1118 | struct v4l2_mpeg2_picture { |
| @@ -1128,6 +1131,7 @@ struct v4l2_mpeg2_picture { · 12 unmodified lines | ||
| 1128 | 1131 | __u8 alternate_scan; |
| 1129 | 1132 | __u8 repeat_first_field; |
| 1130 | 1133 | __u8 progressive_frame; |
| 1134 | + __u8 pad; | |
| 1131 | 1135 | }; |
| 1132 | 1136 | |
| 1133 | 1137 | struct v4l2_ctrl_mpeg2_slice_params { |
| @@ -1142,6 +1146,7 @@ struct v4l2_ctrl_mpeg2_slice_params { · 8 unmodified lines | ||
| 1142 | 1146 | |
| 1143 | 1147 | __u8 backward_ref_index; |
| 1144 | 1148 | __u8 forward_ref_index; |
| 1149 | + __u8 pad; | |
| 1145 | 1150 | }; |
| 1146 | 1151 | |
| 1147 | 1152 | struct v4l2_ctrl_mpeg2_quantization { |