diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-08-18 10:41:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 03:53:13 -0400 |
commit | 140d88165c25137e871f9559e67986ed89251105 (patch) | |
tree | c02891d72b0b85c03d4f493da4c5f37923c836c6 /Documentation/DocBook/media-entities.tmpl | |
parent | 503c3d829eaf48837dd5bff5d97ad66369bb955a (diff) |
[media] media: Media device information query
Create the following ioctl and implement it at the media device level to
query device information.
- MEDIA_IOC_DEVICE_INFO: Query media device information
The ioctl and its data structure are defined in the new kernel header
linux/media.h available to userspace applications.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook/media-entities.tmpl')
-rw-r--r-- | Documentation/DocBook/media-entities.tmpl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl index c47897f046b1..034f891399ed 100644 --- a/Documentation/DocBook/media-entities.tmpl +++ b/Documentation/DocBook/media-entities.tmpl | |||
@@ -11,6 +11,10 @@ | |||
11 | <!ENTITY func-select "<link linkend='func-select'><function>select()</function></link>"> | 11 | <!ENTITY func-select "<link linkend='func-select'><function>select()</function></link>"> |
12 | <!ENTITY func-write "<link linkend='func-write'><function>write()</function></link>"> | 12 | <!ENTITY func-write "<link linkend='func-write'><function>write()</function></link>"> |
13 | 13 | ||
14 | <!ENTITY media-func-close "<link linkend='media-func-close'><function>close()</function></link>"> | ||
15 | <!ENTITY media-func-ioctl "<link linkend='media-func-ioctl'><function>ioctl()</function></link>"> | ||
16 | <!ENTITY media-func-open "<link linkend='media-func-open'><function>open()</function></link>"> | ||
17 | |||
14 | <!-- Ioctls --> | 18 | <!-- Ioctls --> |
15 | <!ENTITY VIDIOC-CROPCAP "<link linkend='vidioc-cropcap'><constant>VIDIOC_CROPCAP</constant></link>"> | 19 | <!ENTITY VIDIOC-CROPCAP "<link linkend='vidioc-cropcap'><constant>VIDIOC_CROPCAP</constant></link>"> |
16 | <!ENTITY VIDIOC-DBG-G-CHIP-IDENT "<link linkend='vidioc-dbg-g-chip-ident'><constant>VIDIOC_DBG_G_CHIP_IDENT</constant></link>"> | 20 | <!ENTITY VIDIOC-DBG-G-CHIP-IDENT "<link linkend='vidioc-dbg-g-chip-ident'><constant>VIDIOC_DBG_G_CHIP_IDENT</constant></link>"> |
@@ -87,6 +91,8 @@ | |||
87 | <!ENTITY VIDIOC-TRY-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_TRY_FMT</constant></link>"> | 91 | <!ENTITY VIDIOC-TRY-FMT "<link linkend='vidioc-g-fmt'><constant>VIDIOC_TRY_FMT</constant></link>"> |
88 | <!ENTITY VIDIOC-UNSUBSCRIBE-EVENT "<link linkend='vidioc-subscribe-event'><constant>VIDIOC_UNSUBSCRIBE_EVENT</constant></link>"> | 92 | <!ENTITY VIDIOC-UNSUBSCRIBE-EVENT "<link linkend='vidioc-subscribe-event'><constant>VIDIOC_UNSUBSCRIBE_EVENT</constant></link>"> |
89 | 93 | ||
94 | <!ENTITY MEDIA-IOC-DEVICE-INFO "<link linkend='media-ioc-device-info'><constant>MEDIA_IOC_DEVICE_INFO</constant></link>"> | ||
95 | |||
90 | <!-- Types --> | 96 | <!-- Types --> |
91 | <!ENTITY v4l2-std-id "<link linkend='v4l2-std-id'>v4l2_std_id</link>"> | 97 | <!ENTITY v4l2-std-id "<link linkend='v4l2-std-id'>v4l2_std_id</link>"> |
92 | 98 | ||
@@ -184,6 +190,8 @@ | |||
184 | <!ENTITY v4l2-vbi-format "struct <link linkend='v4l2-vbi-format'>v4l2_vbi_format</link>"> | 190 | <!ENTITY v4l2-vbi-format "struct <link linkend='v4l2-vbi-format'>v4l2_vbi_format</link>"> |
185 | <!ENTITY v4l2-window "struct <link linkend='v4l2-window'>v4l2_window</link>"> | 191 | <!ENTITY v4l2-window "struct <link linkend='v4l2-window'>v4l2_window</link>"> |
186 | 192 | ||
193 | <!ENTITY media-device-info "struct <link linkend='media-device-info'>media_device_info</link>"> | ||
194 | |||
187 | <!-- Error Codes --> | 195 | <!-- Error Codes --> |
188 | <!ENTITY EACCES "<errorcode>EACCES</errorcode> error code"> | 196 | <!ENTITY EACCES "<errorcode>EACCES</errorcode> error code"> |
189 | <!ENTITY EAGAIN "<errorcode>EAGAIN</errorcode> error code"> | 197 | <!ENTITY EAGAIN "<errorcode>EAGAIN</errorcode> error code"> |
@@ -328,6 +336,10 @@ | |||
328 | <!ENTITY sub-media-indices SYSTEM "media-indices.tmpl"> | 336 | <!ENTITY sub-media-indices SYSTEM "media-indices.tmpl"> |
329 | 337 | ||
330 | <!ENTITY sub-media-controller SYSTEM "v4l/media-controller.xml"> | 338 | <!ENTITY sub-media-controller SYSTEM "v4l/media-controller.xml"> |
339 | <!ENTITY sub-media-open SYSTEM "v4l/media-func-open.xml"> | ||
340 | <!ENTITY sub-media-close SYSTEM "v4l/media-func-close.xml"> | ||
341 | <!ENTITY sub-media-ioctl SYSTEM "v4l/media-func-ioctl.xml"> | ||
342 | <!ENTITY sub-media-ioc-device-info SYSTEM "v4l/media-ioc-device-info.xml"> | ||
331 | 343 | ||
332 | <!-- Function Reference --> | 344 | <!-- Function Reference --> |
333 | <!ENTITY close SYSTEM "v4l/func-close.xml"> | 345 | <!ENTITY close SYSTEM "v4l/func-close.xml"> |