diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-17 12:45:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:16:12 -0400 |
commit | 3b501de58bf4cd16563d1acec43a11c7cd1517fe (patch) | |
tree | 3cb786d293c6e2dddc593b810eed657e585ec751 | |
parent | 6df84ea86e3ae331bd692fb4fbf8b75f43bb4262 (diff) |
Docbook/media: Fix some issues at the docbooks
- Add a few missing entities;
- Some text fixes at remote controllers;
- Add a missing tag at videodev2.h xml version.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/DocBook/media-entities.tmpl | 181 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/remote_controllers.xml | 6 | ||||
-rw-r--r-- | Documentation/DocBook/v4l/videodev2.h.xml | 1 |
3 files changed, 95 insertions, 93 deletions
diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl index 944087b5733e..0eb43c1970bb 100644 --- a/Documentation/DocBook/media-entities.tmpl +++ b/Documentation/DocBook/media-entities.tmpl | |||
@@ -203,96 +203,6 @@ | |||
203 | <!ENTITY sub-libv4l SYSTEM "v4l/libv4l.xml"> | 203 | <!ENTITY sub-libv4l SYSTEM "v4l/libv4l.xml"> |
204 | <!ENTITY sub-remote_controllers SYSTEM "v4l/remote_controllers.xml"> | 204 | <!ENTITY sub-remote_controllers SYSTEM "v4l/remote_controllers.xml"> |
205 | <!ENTITY sub-fdl-appendix SYSTEM "v4l/fdl-appendix.xml"> | 205 | <!ENTITY sub-fdl-appendix SYSTEM "v4l/fdl-appendix.xml"> |
206 | <!ENTITY sub-func-close SYSTEM "v4l/func-close.xml"> | ||
207 | <!ENTITY sub-func-ioctl SYSTEM "v4l/func-ioctl.xml"> | ||
208 | <!ENTITY sub-func-mmap SYSTEM "v4l/func-mmap.xml"> | ||
209 | <!ENTITY sub-func-munmap SYSTEM "v4l/func-munmap.xml"> | ||
210 | <!ENTITY sub-func-open SYSTEM "v4l/func-open.xml"> | ||
211 | <!ENTITY sub-func-poll SYSTEM "v4l/func-poll.xml"> | ||
212 | <!ENTITY sub-func-read SYSTEM "v4l/func-read.xml"> | ||
213 | <!ENTITY sub-func-select SYSTEM "v4l/func-select.xml"> | ||
214 | <!ENTITY sub-func-write SYSTEM "v4l/func-write.xml"> | ||
215 | <!ENTITY sub-io SYSTEM "v4l/io.xml"> | ||
216 | <!ENTITY sub-pixfmt-grey SYSTEM "v4l/pixfmt-grey.xml"> | ||
217 | <!ENTITY sub-pixfmt-nv12 SYSTEM "v4l/pixfmt-nv12.xml"> | ||
218 | <!ENTITY sub-pixfmt-nv16 SYSTEM "v4l/pixfmt-nv16.xml"> | ||
219 | <!ENTITY sub-pixfmt-packed-rgb SYSTEM "v4l/pixfmt-packed-rgb.xml"> | ||
220 | <!ENTITY sub-pixfmt-packed-yuv SYSTEM "v4l/pixfmt-packed-yuv.xml"> | ||
221 | <!ENTITY sub-pixfmt-sbggr16 SYSTEM "v4l/pixfmt-sbggr16.xml"> | ||
222 | <!ENTITY sub-pixfmt-sbggr8 SYSTEM "v4l/pixfmt-sbggr8.xml"> | ||
223 | <!ENTITY sub-pixfmt-sgbrg8 SYSTEM "v4l/pixfmt-sgbrg8.xml"> | ||
224 | <!ENTITY sub-pixfmt-sgrbg8 SYSTEM "v4l/pixfmt-sgrbg8.xml"> | ||
225 | <!ENTITY sub-pixfmt-uyvy SYSTEM "v4l/pixfmt-uyvy.xml"> | ||
226 | <!ENTITY sub-pixfmt-vyuy SYSTEM "v4l/pixfmt-vyuy.xml"> | ||
227 | <!ENTITY sub-pixfmt-y16 SYSTEM "v4l/pixfmt-y16.xml"> | ||
228 | <!ENTITY sub-pixfmt-y41p SYSTEM "v4l/pixfmt-y41p.xml"> | ||
229 | <!ENTITY sub-pixfmt-yuv410 SYSTEM "v4l/pixfmt-yuv410.xml"> | ||
230 | <!ENTITY sub-pixfmt-yuv411p SYSTEM "v4l/pixfmt-yuv411p.xml"> | ||
231 | <!ENTITY sub-pixfmt-yuv420 SYSTEM "v4l/pixfmt-yuv420.xml"> | ||
232 | <!ENTITY sub-pixfmt-yuv422p SYSTEM "v4l/pixfmt-yuv422p.xml"> | ||
233 | <!ENTITY sub-pixfmt-yuyv SYSTEM "v4l/pixfmt-yuyv.xml"> | ||
234 | <!ENTITY sub-pixfmt-yvyu SYSTEM "v4l/pixfmt-yvyu.xml"> | ||
235 | <!ENTITY sub-pixfmt SYSTEM "v4l/pixfmt.xml"> | ||
236 | <!ENTITY sub-vidioc-cropcap SYSTEM "v4l/vidioc-cropcap.xml"> | ||
237 | <!ENTITY sub-vidioc-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml"> | ||
238 | <!ENTITY sub-vidioc-encoder-cmd SYSTEM "v4l/vidioc-encoder-cmd.xml"> | ||
239 | <!ENTITY sub-vidioc-enum-fmt SYSTEM "v4l/vidioc-enum-fmt.xml"> | ||
240 | <!ENTITY sub-vidioc-enum-frameintervals SYSTEM "v4l/vidioc-enum-frameintervals.xml"> | ||
241 | <!ENTITY sub-vidioc-enum-framesizes SYSTEM "v4l/vidioc-enum-framesizes.xml"> | ||
242 | <!ENTITY sub-vidioc-enumaudio SYSTEM "v4l/vidioc-enumaudio.xml"> | ||
243 | <!ENTITY sub-vidioc-enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml"> | ||
244 | <!ENTITY sub-vidioc-enuminput SYSTEM "v4l/vidioc-enuminput.xml"> | ||
245 | <!ENTITY sub-vidioc-enumoutput SYSTEM "v4l/vidioc-enumoutput.xml"> | ||
246 | <!ENTITY sub-vidioc-enumstd SYSTEM "v4l/vidioc-enumstd.xml"> | ||
247 | <!ENTITY sub-vidioc-g-audio SYSTEM "v4l/vidioc-g-audio.xml"> | ||
248 | <!ENTITY sub-vidioc-g-audioout SYSTEM "v4l/vidioc-g-audioout.xml"> | ||
249 | <!ENTITY sub-vidioc-dbg-g-chip-ident SYSTEM "v4l/vidioc-dbg-g-chip-ident.xml"> | ||
250 | <!ENTITY sub-vidioc-g-crop SYSTEM "v4l/vidioc-g-crop.xml"> | ||
251 | <!ENTITY sub-vidioc-g-ctrl SYSTEM "v4l/vidioc-g-ctrl.xml"> | ||
252 | <!ENTITY sub-vidioc-g-enc-index SYSTEM "v4l/vidioc-g-enc-index.xml"> | ||
253 | <!ENTITY sub-vidioc-g-ext-ctrls SYSTEM "v4l/vidioc-g-ext-ctrls.xml"> | ||
254 | <!ENTITY sub-vidioc-g-fbuf SYSTEM "v4l/vidioc-g-fbuf.xml"> | ||
255 | <!ENTITY sub-vidioc-g-fmt SYSTEM "v4l/vidioc-g-fmt.xml"> | ||
256 | <!ENTITY sub-vidioc-g-frequency SYSTEM "v4l/vidioc-g-frequency.xml"> | ||
257 | <!ENTITY sub-vidioc-g-input SYSTEM "v4l/vidioc-g-input.xml"> | ||
258 | <!ENTITY sub-vidioc-g-jpegcomp SYSTEM "v4l/vidioc-g-jpegcomp.xml"> | ||
259 | <!ENTITY sub-vidioc-g-modulator SYSTEM "v4l/vidioc-g-modulator.xml"> | ||
260 | <!ENTITY sub-vidioc-g-output SYSTEM "v4l/vidioc-g-output.xml"> | ||
261 | <!ENTITY sub-vidioc-g-parm SYSTEM "v4l/vidioc-g-parm.xml"> | ||
262 | <!ENTITY sub-vidioc-g-priority SYSTEM "v4l/vidioc-g-priority.xml"> | ||
263 | <!ENTITY sub-vidioc-g-sliced-vbi-cap SYSTEM "v4l/vidioc-g-sliced-vbi-cap.xml"> | ||
264 | <!ENTITY sub-vidioc-g-std SYSTEM "v4l/vidioc-g-std.xml"> | ||
265 | <!ENTITY sub-vidioc-g-tuner SYSTEM "v4l/vidioc-g-tuner.xml"> | ||
266 | <!ENTITY sub-vidioc-log-status SYSTEM "v4l/vidioc-log-status.xml"> | ||
267 | <!ENTITY sub-vidioc-overlay SYSTEM "v4l/vidioc-overlay.xml"> | ||
268 | <!ENTITY sub-vidioc-qbuf SYSTEM "v4l/vidioc-qbuf.xml"> | ||
269 | <!ENTITY sub-vidioc-querybuf SYSTEM "v4l/vidioc-querybuf.xml"> | ||
270 | <!ENTITY sub-vidioc-querycap SYSTEM "v4l/vidioc-querycap.xml"> | ||
271 | <!ENTITY sub-vidioc-queryctrl SYSTEM "v4l/vidioc-queryctrl.xml"> | ||
272 | <!ENTITY sub-vidioc-querystd SYSTEM "v4l/vidioc-querystd.xml"> | ||
273 | <!ENTITY sub-vidioc-reqbufs SYSTEM "v4l/vidioc-reqbufs.xml"> | ||
274 | <!ENTITY sub-vidioc-s-hw-freq-seek SYSTEM "v4l/vidioc-s-hw-freq-seek.xml"> | ||
275 | <!ENTITY sub-vidioc-streamon SYSTEM "v4l/vidioc-streamon.xml"> | ||
276 | <!ENTITY sub-capture-c SYSTEM "v4l/capture.c.xml"> | ||
277 | <!ENTITY sub-keytable-c SYSTEM "v4l/keytable.c.xml"> | ||
278 | <!ENTITY sub-v4l2grab-c SYSTEM "v4l/v4l2grab.c.xml"> | ||
279 | <!ENTITY sub-videodev2-h SYSTEM "v4l/videodev2.h.xml"> | ||
280 | <!ENTITY sub-v4l2 SYSTEM "v4l/v4l2.xml"> | ||
281 | <!ENTITY sub-intro SYSTEM "dvb/intro.xml"> | ||
282 | <!ENTITY sub-frontend SYSTEM "dvb/frontend.xml"> | ||
283 | <!ENTITY sub-demux SYSTEM "dvb/demux.xml"> | ||
284 | <!ENTITY sub-video SYSTEM "dvb/video.xml"> | ||
285 | <!ENTITY sub-audio SYSTEM "dvb/audio.xml"> | ||
286 | <!ENTITY sub-ca SYSTEM "dvb/ca.xml"> | ||
287 | <!ENTITY sub-net SYSTEM "dvb/net.xml"> | ||
288 | <!ENTITY sub-kdapi SYSTEM "dvb/kdapi.xml"> | ||
289 | <!ENTITY sub-examples SYSTEM "dvb/examples.xml"> | ||
290 | <!ENTITY sub-dvbapi SYSTEM "dvb/dvbapi.xml"> | ||
291 | <!ENTITY sub-media SYSTEM "media.xml"> | ||
292 | <!ENTITY sub-media-entities SYSTEM "media-entities.xml"> | ||
293 | <!ENTITY sub-media-indices SYSTEM "media-indices.tmpl"> | ||
294 | |||
295 | <!-- Function Reference --> | ||
296 | <!ENTITY sub-close SYSTEM "v4l/func-close.xml"> | 206 | <!ENTITY sub-close SYSTEM "v4l/func-close.xml"> |
297 | <!ENTITY sub-ioctl SYSTEM "v4l/func-ioctl.xml"> | 207 | <!ENTITY sub-ioctl SYSTEM "v4l/func-ioctl.xml"> |
298 | <!ENTITY sub-mmap SYSTEM "v4l/func-mmap.xml"> | 208 | <!ENTITY sub-mmap SYSTEM "v4l/func-mmap.xml"> |
@@ -302,6 +212,7 @@ | |||
302 | <!ENTITY sub-read SYSTEM "v4l/func-read.xml"> | 212 | <!ENTITY sub-read SYSTEM "v4l/func-read.xml"> |
303 | <!ENTITY sub-select SYSTEM "v4l/func-select.xml"> | 213 | <!ENTITY sub-select SYSTEM "v4l/func-select.xml"> |
304 | <!ENTITY sub-write SYSTEM "v4l/func-write.xml"> | 214 | <!ENTITY sub-write SYSTEM "v4l/func-write.xml"> |
215 | <!ENTITY sub-io SYSTEM "v4l/io.xml"> | ||
305 | <!ENTITY sub-grey SYSTEM "v4l/pixfmt-grey.xml"> | 216 | <!ENTITY sub-grey SYSTEM "v4l/pixfmt-grey.xml"> |
306 | <!ENTITY sub-nv12 SYSTEM "v4l/pixfmt-nv12.xml"> | 217 | <!ENTITY sub-nv12 SYSTEM "v4l/pixfmt-nv12.xml"> |
307 | <!ENTITY sub-nv16 SYSTEM "v4l/pixfmt-nv16.xml"> | 218 | <!ENTITY sub-nv16 SYSTEM "v4l/pixfmt-nv16.xml"> |
@@ -321,6 +232,7 @@ | |||
321 | <!ENTITY sub-yuv422p SYSTEM "v4l/pixfmt-yuv422p.xml"> | 232 | <!ENTITY sub-yuv422p SYSTEM "v4l/pixfmt-yuv422p.xml"> |
322 | <!ENTITY sub-yuyv SYSTEM "v4l/pixfmt-yuyv.xml"> | 233 | <!ENTITY sub-yuyv SYSTEM "v4l/pixfmt-yuyv.xml"> |
323 | <!ENTITY sub-yvyu SYSTEM "v4l/pixfmt-yvyu.xml"> | 234 | <!ENTITY sub-yvyu SYSTEM "v4l/pixfmt-yvyu.xml"> |
235 | <!ENTITY sub-pixfmt SYSTEM "v4l/pixfmt.xml"> | ||
324 | <!ENTITY sub-cropcap SYSTEM "v4l/vidioc-cropcap.xml"> | 236 | <!ENTITY sub-cropcap SYSTEM "v4l/vidioc-cropcap.xml"> |
325 | <!ENTITY sub-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml"> | 237 | <!ENTITY sub-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml"> |
326 | <!ENTITY sub-encoder-cmd SYSTEM "v4l/vidioc-encoder-cmd.xml"> | 238 | <!ENTITY sub-encoder-cmd SYSTEM "v4l/vidioc-encoder-cmd.xml"> |
@@ -361,3 +273,92 @@ | |||
361 | <!ENTITY sub-reqbufs SYSTEM "v4l/vidioc-reqbufs.xml"> | 273 | <!ENTITY sub-reqbufs SYSTEM "v4l/vidioc-reqbufs.xml"> |
362 | <!ENTITY sub-s-hw-freq-seek SYSTEM "v4l/vidioc-s-hw-freq-seek.xml"> | 274 | <!ENTITY sub-s-hw-freq-seek SYSTEM "v4l/vidioc-s-hw-freq-seek.xml"> |
363 | <!ENTITY sub-streamon SYSTEM "v4l/vidioc-streamon.xml"> | 275 | <!ENTITY sub-streamon SYSTEM "v4l/vidioc-streamon.xml"> |
276 | <!ENTITY sub-capture-c SYSTEM "v4l/capture.c.xml"> | ||
277 | <!ENTITY sub-keytable-c SYSTEM "v4l/keytable.c.xml"> | ||
278 | <!ENTITY sub-v4l2grab-c SYSTEM "v4l/v4l2grab.c.xml"> | ||
279 | <!ENTITY sub-videodev2-h SYSTEM "v4l/videodev2.h.xml"> | ||
280 | <!ENTITY sub-v4l2 SYSTEM "v4l/v4l2.xml"> | ||
281 | <!ENTITY sub-intro SYSTEM "dvb/intro.xml"> | ||
282 | <!ENTITY sub-frontend SYSTEM "dvb/frontend.xml"> | ||
283 | <!ENTITY sub-isdbt SYSTEM "dvb/isdbt.xml"> | ||
284 | <!ENTITY sub-demux SYSTEM "dvb/demux.xml"> | ||
285 | <!ENTITY sub-video SYSTEM "dvb/video.xml"> | ||
286 | <!ENTITY sub-audio SYSTEM "dvb/audio.xml"> | ||
287 | <!ENTITY sub-ca SYSTEM "dvb/ca.xml"> | ||
288 | <!ENTITY sub-net SYSTEM "dvb/net.xml"> | ||
289 | <!ENTITY sub-kdapi SYSTEM "dvb/kdapi.xml"> | ||
290 | <!ENTITY sub-examples SYSTEM "dvb/examples.xml"> | ||
291 | <!ENTITY sub-dvbapi SYSTEM "dvb/dvbapi.xml"> | ||
292 | <!ENTITY sub-media SYSTEM "media.xml"> | ||
293 | <!ENTITY sub-media-entities SYSTEM "media-entities.tmpl"> | ||
294 | <!ENTITY sub-media-indices SYSTEM "media-indices.tmpl"> | ||
295 | |||
296 | <!-- Function Reference --> | ||
297 | <!ENTITY close SYSTEM "v4l/func-close.xml"> | ||
298 | <!ENTITY ioctl SYSTEM "v4l/func-ioctl.xml"> | ||
299 | <!ENTITY mmap SYSTEM "v4l/func-mmap.xml"> | ||
300 | <!ENTITY munmap SYSTEM "v4l/func-munmap.xml"> | ||
301 | <!ENTITY open SYSTEM "v4l/func-open.xml"> | ||
302 | <!ENTITY poll SYSTEM "v4l/func-poll.xml"> | ||
303 | <!ENTITY read SYSTEM "v4l/func-read.xml"> | ||
304 | <!ENTITY select SYSTEM "v4l/func-select.xml"> | ||
305 | <!ENTITY write SYSTEM "v4l/func-write.xml"> | ||
306 | <!ENTITY grey SYSTEM "v4l/pixfmt-grey.xml"> | ||
307 | <!ENTITY nv12 SYSTEM "v4l/pixfmt-nv12.xml"> | ||
308 | <!ENTITY nv16 SYSTEM "v4l/pixfmt-nv16.xml"> | ||
309 | <!ENTITY packed-rgb SYSTEM "v4l/pixfmt-packed-rgb.xml"> | ||
310 | <!ENTITY packed-yuv SYSTEM "v4l/pixfmt-packed-yuv.xml"> | ||
311 | <!ENTITY sbggr16 SYSTEM "v4l/pixfmt-sbggr16.xml"> | ||
312 | <!ENTITY sbggr8 SYSTEM "v4l/pixfmt-sbggr8.xml"> | ||
313 | <!ENTITY sgbrg8 SYSTEM "v4l/pixfmt-sgbrg8.xml"> | ||
314 | <!ENTITY sgrbg8 SYSTEM "v4l/pixfmt-sgrbg8.xml"> | ||
315 | <!ENTITY uyvy SYSTEM "v4l/pixfmt-uyvy.xml"> | ||
316 | <!ENTITY vyuy SYSTEM "v4l/pixfmt-vyuy.xml"> | ||
317 | <!ENTITY y16 SYSTEM "v4l/pixfmt-y16.xml"> | ||
318 | <!ENTITY y41p SYSTEM "v4l/pixfmt-y41p.xml"> | ||
319 | <!ENTITY yuv410 SYSTEM "v4l/pixfmt-yuv410.xml"> | ||
320 | <!ENTITY yuv411p SYSTEM "v4l/pixfmt-yuv411p.xml"> | ||
321 | <!ENTITY yuv420 SYSTEM "v4l/pixfmt-yuv420.xml"> | ||
322 | <!ENTITY yuv422p SYSTEM "v4l/pixfmt-yuv422p.xml"> | ||
323 | <!ENTITY yuyv SYSTEM "v4l/pixfmt-yuyv.xml"> | ||
324 | <!ENTITY yvyu SYSTEM "v4l/pixfmt-yvyu.xml"> | ||
325 | <!ENTITY cropcap SYSTEM "v4l/vidioc-cropcap.xml"> | ||
326 | <!ENTITY dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml"> | ||
327 | <!ENTITY encoder-cmd SYSTEM "v4l/vidioc-encoder-cmd.xml"> | ||
328 | <!ENTITY enum-fmt SYSTEM "v4l/vidioc-enum-fmt.xml"> | ||
329 | <!ENTITY enum-frameintervals SYSTEM "v4l/vidioc-enum-frameintervals.xml"> | ||
330 | <!ENTITY enum-framesizes SYSTEM "v4l/vidioc-enum-framesizes.xml"> | ||
331 | <!ENTITY enumaudio SYSTEM "v4l/vidioc-enumaudio.xml"> | ||
332 | <!ENTITY enumaudioout SYSTEM "v4l/vidioc-enumaudioout.xml"> | ||
333 | <!ENTITY enuminput SYSTEM "v4l/vidioc-enuminput.xml"> | ||
334 | <!ENTITY enumoutput SYSTEM "v4l/vidioc-enumoutput.xml"> | ||
335 | <!ENTITY enumstd SYSTEM "v4l/vidioc-enumstd.xml"> | ||
336 | <!ENTITY g-audio SYSTEM "v4l/vidioc-g-audio.xml"> | ||
337 | <!ENTITY g-audioout SYSTEM "v4l/vidioc-g-audioout.xml"> | ||
338 | <!ENTITY dbg-g-chip-ident SYSTEM "v4l/vidioc-dbg-g-chip-ident.xml"> | ||
339 | <!ENTITY g-crop SYSTEM "v4l/vidioc-g-crop.xml"> | ||
340 | <!ENTITY g-ctrl SYSTEM "v4l/vidioc-g-ctrl.xml"> | ||
341 | <!ENTITY g-enc-index SYSTEM "v4l/vidioc-g-enc-index.xml"> | ||
342 | <!ENTITY g-ext-ctrls SYSTEM "v4l/vidioc-g-ext-ctrls.xml"> | ||
343 | <!ENTITY g-fbuf SYSTEM "v4l/vidioc-g-fbuf.xml"> | ||
344 | <!ENTITY g-fmt SYSTEM "v4l/vidioc-g-fmt.xml"> | ||
345 | <!ENTITY g-frequency SYSTEM "v4l/vidioc-g-frequency.xml"> | ||
346 | <!ENTITY g-input SYSTEM "v4l/vidioc-g-input.xml"> | ||
347 | <!ENTITY g-jpegcomp SYSTEM "v4l/vidioc-g-jpegcomp.xml"> | ||
348 | <!ENTITY g-modulator SYSTEM "v4l/vidioc-g-modulator.xml"> | ||
349 | <!ENTITY g-output SYSTEM "v4l/vidioc-g-output.xml"> | ||
350 | <!ENTITY g-parm SYSTEM "v4l/vidioc-g-parm.xml"> | ||
351 | <!ENTITY g-priority SYSTEM "v4l/vidioc-g-priority.xml"> | ||
352 | <!ENTITY g-sliced-vbi-cap SYSTEM "v4l/vidioc-g-sliced-vbi-cap.xml"> | ||
353 | <!ENTITY g-std SYSTEM "v4l/vidioc-g-std.xml"> | ||
354 | <!ENTITY g-tuner SYSTEM "v4l/vidioc-g-tuner.xml"> | ||
355 | <!ENTITY log-status SYSTEM "v4l/vidioc-log-status.xml"> | ||
356 | <!ENTITY overlay SYSTEM "v4l/vidioc-overlay.xml"> | ||
357 | <!ENTITY qbuf SYSTEM "v4l/vidioc-qbuf.xml"> | ||
358 | <!ENTITY querybuf SYSTEM "v4l/vidioc-querybuf.xml"> | ||
359 | <!ENTITY querycap SYSTEM "v4l/vidioc-querycap.xml"> | ||
360 | <!ENTITY queryctrl SYSTEM "v4l/vidioc-queryctrl.xml"> | ||
361 | <!ENTITY querystd SYSTEM "v4l/vidioc-querystd.xml"> | ||
362 | <!ENTITY reqbufs SYSTEM "v4l/vidioc-reqbufs.xml"> | ||
363 | <!ENTITY s-hw-freq-seek SYSTEM "v4l/vidioc-s-hw-freq-seek.xml"> | ||
364 | <!ENTITY streamon SYSTEM "v4l/vidioc-streamon.xml"> | ||
diff --git a/Documentation/DocBook/v4l/remote_controllers.xml b/Documentation/DocBook/v4l/remote_controllers.xml index 985325cbc9ad..73f5eab091f4 100644 --- a/Documentation/DocBook/v4l/remote_controllers.xml +++ b/Documentation/DocBook/v4l/remote_controllers.xml | |||
@@ -2,12 +2,12 @@ | |||
2 | <section id="Remote_controllers_Intro"> | 2 | <section id="Remote_controllers_Intro"> |
3 | <title>Introduction</title> | 3 | <title>Introduction</title> |
4 | 4 | ||
5 | <para>Currently, most analog and digital devices have a Infrared input for remote controllers. Each | 5 | <para>Currently, most analog and digital devices have a Infrared input for remote controllers. Each |
6 | manufacturer has their own type of control. It is not rare for the same manufacturer to ship different | 6 | manufacturer has their own type of control. It is not rare for the same manufacturer to ship different |
7 | types of controls, depending on the device.</para> | 7 | types of controls, depending on the device.</para> |
8 | <para>Unfortunately, for several years, there was no effort to create uniform IR keycodes for | 8 | <para>Unfortunately, for several years, there was no effort to create uniform IR keycodes for |
9 | different devices. This caused the same IR keyname to be mapped completely differently on | 9 | different devices. This caused the same IR keyname to be mapped completely differently on |
10 | different IR devices. This resulted that the same IR keyname to be mapped completely different on | 10 | different IR devices. This resulted that the same IR keyname to be mapped completely different on |
11 | different IR's. Due to that, V4L2 API now specifies a standard for mapping Media keys on IR.</para> | 11 | different IR's. Due to that, V4L2 API now specifies a standard for mapping Media keys on IR.</para> |
12 | <para>This standard should be used by both V4L/DVB drivers and userspace applications</para> | 12 | <para>This standard should be used by both V4L/DVB drivers and userspace applications</para> |
13 | <para>The modules register the remote as keyboard within the linux input layer. This means that the IR key strokes will look like normal keyboard key strokes (if CONFIG_INPUT_KEYBOARD is enabled). Using the event devices (CONFIG_INPUT_EVDEV) it is possible for applications to access the remote via /dev/input/event devices.</para> | 13 | <para>The modules register the remote as keyboard within the linux input layer. This means that the IR key strokes will look like normal keyboard key strokes (if CONFIG_INPUT_KEYBOARD is enabled). Using the event devices (CONFIG_INPUT_EVDEV) it is possible for applications to access the remote via /dev/input/event devices.</para> |
diff --git a/Documentation/DocBook/v4l/videodev2.h.xml b/Documentation/DocBook/v4l/videodev2.h.xml index 6a8e13940699..97002060ac4f 100644 --- a/Documentation/DocBook/v4l/videodev2.h.xml +++ b/Documentation/DocBook/v4l/videodev2.h.xml | |||
@@ -362,6 +362,7 @@ struct <link linkend="v4l2-pix-format">v4l2_pix_format</link> { | |||
362 | #define <link linkend="V4L2-PIX-FMT-PJPG">V4L2_PIX_FMT_PJPG</link> v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ | 362 | #define <link linkend="V4L2-PIX-FMT-PJPG">V4L2_PIX_FMT_PJPG</link> v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ |
363 | #define <link linkend="V4L2-PIX-FMT-OV511">V4L2_PIX_FMT_OV511</link> v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */ | 363 | #define <link linkend="V4L2-PIX-FMT-OV511">V4L2_PIX_FMT_OV511</link> v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */ |
364 | #define <link linkend="V4L2-PIX-FMT-OV518">V4L2_PIX_FMT_OV518</link> v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */ | 364 | #define <link linkend="V4L2-PIX-FMT-OV518">V4L2_PIX_FMT_OV518</link> v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */ |
365 | #define <link linkend="V4L2-PIX-FMT-TM6000">V4L2_PIX_FMT_TM6000</link> v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */ | ||
365 | 366 | ||
366 | /* | 367 | /* |
367 | * F O R M A T E N U M E R A T I O N | 368 | * F O R M A T E N U M E R A T I O N |