aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-05-28 11:16:41 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 06:07:32 -0400
commit78b526a43561d7e5e702ba27948e422dfbc4bea1 (patch)
tree67c8b7150b51f6a82275af6f5baaedff4eaf40c0 /include/media
parent0e3bd2b9996dfa4105617e2369155823df6b389a (diff)
V4L/DVB (7949): videodev: renamed the vidioc_*_fmt_* callbacks
The naming for the callbacks that handle the VIDIOC_ENUM_FMT and VIDIOC_S/G/TRY_FMT ioctls was very confusing. Renamed it to match the v4l2_buf_type name. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-dev.h68
1 files changed, 31 insertions, 37 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index f14181fae6ce..40b0810a595a 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -118,82 +118,76 @@ struct video_device
118 enum v4l2_priority p); 118 enum v4l2_priority p);
119 119
120 /* VIDIOC_ENUM_FMT handlers */ 120 /* VIDIOC_ENUM_FMT handlers */
121 int (*vidioc_enum_fmt_cap) (struct file *file, void *fh, 121 int (*vidioc_enum_fmt_vid_cap) (struct file *file, void *fh,
122 struct v4l2_fmtdesc *f); 122 struct v4l2_fmtdesc *f);
123 int (*vidioc_enum_fmt_overlay) (struct file *file, void *fh, 123 int (*vidioc_enum_fmt_vid_overlay) (struct file *file, void *fh,
124 struct v4l2_fmtdesc *f); 124 struct v4l2_fmtdesc *f);
125 int (*vidioc_enum_fmt_vbi) (struct file *file, void *fh, 125 int (*vidioc_enum_fmt_vid_out) (struct file *file, void *fh,
126 struct v4l2_fmtdesc *f); 126 struct v4l2_fmtdesc *f);
127 int (*vidioc_enum_fmt_vbi_capture) (struct file *file, void *fh, 127#if 1
128 struct v4l2_fmtdesc *f); 128 /* deprecated, will be removed in 2.6.28 */
129 int (*vidioc_enum_fmt_video_output)(struct file *file, void *fh, 129 int (*vidioc_enum_fmt_vbi_cap) (struct file *file, void *fh,
130 struct v4l2_fmtdesc *f);
131 int (*vidioc_enum_fmt_output_overlay) (struct file *file, void *fh,
132 struct v4l2_fmtdesc *f);
133 int (*vidioc_enum_fmt_vbi_output) (struct file *file, void *fh,
134 struct v4l2_fmtdesc *f);
135 int (*vidioc_enum_fmt_sliced_vbi_output) (struct file *file, void *fh,
136 struct v4l2_fmtdesc *f); 130 struct v4l2_fmtdesc *f);
131#endif
137 int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh, 132 int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
138 struct v4l2_fmtdesc *f); 133 struct v4l2_fmtdesc *f);
139 134
140 /* VIDIOC_G_FMT handlers */ 135 /* VIDIOC_G_FMT handlers */
141 int (*vidioc_g_fmt_cap) (struct file *file, void *fh, 136 int (*vidioc_g_fmt_vid_cap) (struct file *file, void *fh,
142 struct v4l2_format *f); 137 struct v4l2_format *f);
143 int (*vidioc_g_fmt_overlay) (struct file *file, void *fh, 138 int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
144 struct v4l2_format *f); 139 struct v4l2_format *f);
145 int (*vidioc_g_fmt_vbi) (struct file *file, void *fh, 140 int (*vidioc_g_fmt_vid_out) (struct file *file, void *fh,
146 struct v4l2_format *f); 141 struct v4l2_format *f);
147 int (*vidioc_g_fmt_vbi_output) (struct file *file, void *fh, 142 int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
148 struct v4l2_format *f); 143 struct v4l2_format *f);
149 int (*vidioc_g_fmt_sliced_vbi_output) (struct file *file, void *fh, 144 int (*vidioc_g_fmt_vbi_cap) (struct file *file, void *fh,
150 struct v4l2_format *f); 145 struct v4l2_format *f);
151 int (*vidioc_g_fmt_vbi_capture)(struct file *file, void *fh, 146 int (*vidioc_g_fmt_vbi_out) (struct file *file, void *fh,
152 struct v4l2_format *f); 147 struct v4l2_format *f);
153 int (*vidioc_g_fmt_video_output)(struct file *file, void *fh, 148 int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *fh,
154 struct v4l2_format *f); 149 struct v4l2_format *f);
155 int (*vidioc_g_fmt_output_overlay) (struct file *file, void *fh, 150 int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh,
156 struct v4l2_format *f); 151 struct v4l2_format *f);
157 int (*vidioc_g_fmt_type_private)(struct file *file, void *fh, 152 int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
158 struct v4l2_format *f); 153 struct v4l2_format *f);
159 154
160 /* VIDIOC_S_FMT handlers */ 155 /* VIDIOC_S_FMT handlers */
161 int (*vidioc_s_fmt_cap) (struct file *file, void *fh, 156 int (*vidioc_s_fmt_vid_cap) (struct file *file, void *fh,
162 struct v4l2_format *f); 157 struct v4l2_format *f);
163 158 int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
164 int (*vidioc_s_fmt_overlay) (struct file *file, void *fh,
165 struct v4l2_format *f); 159 struct v4l2_format *f);
166 int (*vidioc_s_fmt_vbi) (struct file *file, void *fh, 160 int (*vidioc_s_fmt_vid_out) (struct file *file, void *fh,
167 struct v4l2_format *f); 161 struct v4l2_format *f);
168 int (*vidioc_s_fmt_vbi_output) (struct file *file, void *fh, 162 int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
169 struct v4l2_format *f); 163 struct v4l2_format *f);
170 int (*vidioc_s_fmt_sliced_vbi_output) (struct file *file, void *fh, 164 int (*vidioc_s_fmt_vbi_cap) (struct file *file, void *fh,
171 struct v4l2_format *f); 165 struct v4l2_format *f);
172 int (*vidioc_s_fmt_vbi_capture)(struct file *file, void *fh, 166 int (*vidioc_s_fmt_vbi_out) (struct file *file, void *fh,
173 struct v4l2_format *f); 167 struct v4l2_format *f);
174 int (*vidioc_s_fmt_video_output)(struct file *file, void *fh, 168 int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *fh,
175 struct v4l2_format *f); 169 struct v4l2_format *f);
176 int (*vidioc_s_fmt_output_overlay) (struct file *file, void *fh, 170 int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh,
177 struct v4l2_format *f); 171 struct v4l2_format *f);
178 int (*vidioc_s_fmt_type_private)(struct file *file, void *fh, 172 int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
179 struct v4l2_format *f); 173 struct v4l2_format *f);
180 174
181 /* VIDIOC_TRY_FMT handlers */ 175 /* VIDIOC_TRY_FMT handlers */
182 int (*vidioc_try_fmt_cap) (struct file *file, void *fh, 176 int (*vidioc_try_fmt_vid_cap) (struct file *file, void *fh,
183 struct v4l2_format *f); 177 struct v4l2_format *f);
184 int (*vidioc_try_fmt_overlay) (struct file *file, void *fh, 178 int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
185 struct v4l2_format *f); 179 struct v4l2_format *f);
186 int (*vidioc_try_fmt_vbi) (struct file *file, void *fh, 180 int (*vidioc_try_fmt_vid_out) (struct file *file, void *fh,
187 struct v4l2_format *f); 181 struct v4l2_format *f);
188 int (*vidioc_try_fmt_vbi_output) (struct file *file, void *fh, 182 int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
189 struct v4l2_format *f); 183 struct v4l2_format *f);
190 int (*vidioc_try_fmt_sliced_vbi_output) (struct file *file, void *fh, 184 int (*vidioc_try_fmt_vbi_cap) (struct file *file, void *fh,
191 struct v4l2_format *f); 185 struct v4l2_format *f);
192 int (*vidioc_try_fmt_vbi_capture)(struct file *file, void *fh, 186 int (*vidioc_try_fmt_vbi_out) (struct file *file, void *fh,
193 struct v4l2_format *f); 187 struct v4l2_format *f);
194 int (*vidioc_try_fmt_video_output)(struct file *file, void *fh, 188 int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *fh,
195 struct v4l2_format *f); 189 struct v4l2_format *f);
196 int (*vidioc_try_fmt_output_overlay)(struct file *file, void *fh, 190 int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh,
197 struct v4l2_format *f); 191 struct v4l2_format *f);
198 int (*vidioc_try_fmt_type_private)(struct file *file, void *fh, 192 int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
199 struct v4l2_format *f); 193 struct v4l2_format *f);
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-25 20:33:34 -0400