diff options
-rw-r--r-- | include/uapi/linux/v4l2-subdev.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/uapi/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h index e0a7e3da498a..dbce2b554e02 100644 --- a/include/uapi/linux/v4l2-subdev.h +++ b/include/uapi/linux/v4l2-subdev.h | |||
@@ -69,12 +69,14 @@ struct v4l2_subdev_crop { | |||
69 | * @pad: pad number, as reported by the media API | 69 | * @pad: pad number, as reported by the media API |
70 | * @index: format index during enumeration | 70 | * @index: format index during enumeration |
71 | * @code: format code (MEDIA_BUS_FMT_ definitions) | 71 | * @code: format code (MEDIA_BUS_FMT_ definitions) |
72 | * @which: format type (from enum v4l2_subdev_format_whence) | ||
72 | */ | 73 | */ |
73 | struct v4l2_subdev_mbus_code_enum { | 74 | struct v4l2_subdev_mbus_code_enum { |
74 | __u32 pad; | 75 | __u32 pad; |
75 | __u32 index; | 76 | __u32 index; |
76 | __u32 code; | 77 | __u32 code; |
77 | __u32 reserved[9]; | 78 | __u32 which; |
79 | __u32 reserved[8]; | ||
78 | }; | 80 | }; |
79 | 81 | ||
80 | /** | 82 | /** |
@@ -82,6 +84,7 @@ struct v4l2_subdev_mbus_code_enum { | |||
82 | * @pad: pad number, as reported by the media API | 84 | * @pad: pad number, as reported by the media API |
83 | * @index: format index during enumeration | 85 | * @index: format index during enumeration |
84 | * @code: format code (MEDIA_BUS_FMT_ definitions) | 86 | * @code: format code (MEDIA_BUS_FMT_ definitions) |
87 | * @which: format type (from enum v4l2_subdev_format_whence) | ||
85 | */ | 88 | */ |
86 | struct v4l2_subdev_frame_size_enum { | 89 | struct v4l2_subdev_frame_size_enum { |
87 | __u32 index; | 90 | __u32 index; |
@@ -91,7 +94,8 @@ struct v4l2_subdev_frame_size_enum { | |||
91 | __u32 max_width; | 94 | __u32 max_width; |
92 | __u32 min_height; | 95 | __u32 min_height; |
93 | __u32 max_height; | 96 | __u32 max_height; |
94 | __u32 reserved[9]; | 97 | __u32 which; |
98 | __u32 reserved[8]; | ||
95 | }; | 99 | }; |
96 | 100 | ||
97 | /** | 101 | /** |
@@ -113,6 +117,7 @@ struct v4l2_subdev_frame_interval { | |||
113 | * @width: frame width in pixels | 117 | * @width: frame width in pixels |
114 | * @height: frame height in pixels | 118 | * @height: frame height in pixels |
115 | * @interval: frame interval in seconds | 119 | * @interval: frame interval in seconds |
120 | * @which: format type (from enum v4l2_subdev_format_whence) | ||
116 | */ | 121 | */ |
117 | struct v4l2_subdev_frame_interval_enum { | 122 | struct v4l2_subdev_frame_interval_enum { |
118 | __u32 index; | 123 | __u32 index; |
@@ -121,7 +126,8 @@ struct v4l2_subdev_frame_interval_enum { | |||
121 | __u32 width; | 126 | __u32 width; |
122 | __u32 height; | 127 | __u32 height; |
123 | struct v4l2_fract interval; | 128 | struct v4l2_fract interval; |
124 | __u32 reserved[9]; | 129 | __u32 which; |
130 | __u32 reserved[8]; | ||
125 | }; | 131 | }; |
126 | 132 | ||
127 | /** | 133 | /** |