media documentation ReST fixes
Subsystems (2)
PATCH 3/12 media: vidioc-g-tuner.rst: Fix table number of cols
In reply to Mauro Carvalho ChehabThe Tuner Audio Matrix table is broken: the first row has 7 columns instead of 6, causing it to be parsed wrong and displayed very badly on PDF output.
Fix it and adjust the table to look nice at PDF output
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
Documentation/media/uapi/v4l/vidioc-g-tuner.rst +6 -3
@@ -395,20 +395,23 @@ To change the radio frequency the \scriptsize +.. tabularcolumns:: |p{1.5cm}|p{1.5cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}| + .. _tuner-matrix: .. flat-table:: Tuner Audio Matrix :header-rows: 2 :stub-columns: 0 + :widths: 7 7 14 14 14 14 * - - - :cspan:`5` Selected ``V4L2_TUNER_MODE_`` + - :cspan:`4` Selected ``V4L2_TUNER_MODE_`` * - Received ``V4L2_TUNER_SUB_`` - ``MONO`` - ``STEREO`` - ``LANG1`` - ``LANG2 = SAP`` - - ``LANG1_LANG2``\ [#f1]_ + - ``LANG1_LANG2``\ [#f1]_ * - ``MONO`` - Mono - Mono/Mono
@@ -435,7 +438,7 @@ To change the radio frequency the - L+R/SAP (preferred) or L/R or L+R/L+R * - ``LANG1 | LANG2`` - Language 1 - - Lang1/Lang2 (deprecated [#f2]_) or Lang1/Lang1 + - Lang1/Lang2 (deprecated\ [#f2]_) or Lang1/Lang1 - Language 1 - Language 2 - Lang1/Lang2 (preferred) or Lang1/Lang1
Signature · 1 line
2.13.5
PATCH 5/12 media: docs: fix PDF build with Sphinx 1.4
In reply to Mauro Carvalho Chehabchangeset 70b074df4ed1 ("media: fix pdf build with Spinx 1.6") caused a regression at Sphinx 1.4 PDF build: although it produces a full document in batch mode, it returns errors on interactive mode:
[63]
Runaway argument?
{\relax
! Paragraph ended before \multicolumn was complete.
<to be read again>
\par
l.7703 \hline\end{tabulary}The error seems to be due to some bug at Sphinx PDF output:
when multicolumns is used, it doesn't accept an empty string.
Just removing the :cpan:1 and replacing by two empty columns fix the issue.
Fixes 70b074df4ed1 ("media: fix pdf build with Spinx 1.6")
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 6 ++++-- Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-)
Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst +4 -2
@@ -35,7 +35,8 @@ next to each other in memory. - :cspan:`7` Byte 1 - :cspan:`7` Byte 2 - :cspan:`7` Byte 3 - * - :cspan:`1` + * - + - - 7 - 6 - 5
@@ -665,7 +666,8 @@ either the corresponding ARGB or XRGB format, depending on the driver. - :cspan:`7` Byte 2 - :cspan:`7` Byte 3 - * - :cspan:`1` + * - + - - 7 - 6 - 5
Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst +2 -1
@@ -37,7 +37,8 @@ component of each pixel in one 16 or 32 bit word. - :cspan:`7` Byte 2 - :cspan:`7` Byte 3 - * - :cspan:`1` + * - + - - 7 - 6 - 5
Signature · 1 line
2.13.5
PATCH 6/12 media: rc-sysfs-nodes.rst: better use literals
In reply to Mauro Carvalho ChehabA literal box provides a better visual when pdf and html output is generated for things like the output of a sysfs devnode. It alsod matches other conventions used within the media book.
So, use it.
While here, use literals for protocol names.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/rc/rc-sysfs-nodes.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Documentation/media/uapi/rc/rc-sysfs-nodes.rst +5 -5
@@ -34,9 +34,9 @@ receiver device where N is the number of the receiver. /sys/class/rc/rcN/protocols =========================== -Reading this file returns a list of available protocols, something like: +Reading this file returns a list of available protocols, something like:: -``rc5 [rc6] nec jvc [sony]`` + rc5 [rc6] nec jvc [sony] Enabled protocols are shown in [] brackets.
@@ -90,11 +90,11 @@ This value may be reset to 0 if the current protocol is altered. ================================== Reading this file returns a list of available protocols to use for the -wakeup filter, something like: +wakeup filter, something like:: -``rc-5 nec nec-x rc-6-0 rc-6-6a-24 [rc-6-6a-32] rc-6-mce`` + rc-5 nec nec-x rc-6-0 rc-6-6a-24 [rc-6-6a-32] rc-6-mce -Note that protocol variants are listed, so "nec", "sony", "rc-5", "rc-6" +Note that protocol variants are listed, so ``nec``, ``sony``, ``rc-5``, ``rc-6`` have their different bit length encodings listed if available. Note that all protocol variants are listed.
Signature · 1 line
2.13.5
PATCH 4/12 media: v4l uAPI docs: adjust some tables for PDF output
In reply to Mauro Carvalho ChehabOn tests with Spinx 1.4, some tables are still writing text outside cells. Adjust those tables.
PS.: As this was revisited several times, I suspect that this will only be fully fixed if we add tabularcolumns to all tables at the V4L2 part of the book.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/v4l/colorspaces-defs.rst | 2 ++ Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 2 +- Documentation/media/uapi/v4l/v4l2-selection-targets.rst | 2 +- Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst | 2 ++ Documentation/media/uapi/v4l/vidioc-querycap.rst | 2 +- Documentation/media/uapi/v4l/vidioc-subscribe-event.rst | 4 ++-- 6 files changed, 9 insertions(+), 5 deletions(-)
Documentation/media/uapi/v4l/colorspaces-defs.rst +2 -0
@@ -76,6 +76,8 @@ whole range, 0-255, dividing the angular value by 1.41. The enum .. c:type:: v4l2_xfer_func +.. tabularcolumns:: |p{5.5cm}|p{12.0cm}| + .. flat-table:: V4L2 Transfer Function :header-rows: 1 :stub-columns: 0
Documentation/media/uapi/v4l/pixfmt-srggb10p.rst +1 -1
@@ -36,7 +36,7 @@ Each cell is one byte. .. raw:: latex - \small + \newline\small .. tabularcolumns:: |p{2.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{10.0cm}|
Documentation/media/uapi/v4l/v4l2-selection-targets.rst +1 -1
@@ -12,7 +12,7 @@ of the two interfaces they are used. .. _v4l2-selection-targets-table: -.. tabularcolumns:: |p{5.8cm}|p{1.4cm}|p{6.5cm}|p{1.2cm}|p{1.6cm}| +.. tabularcolumns:: |p{6.0cm}|p{1.4cm}|p{7.4cm}|p{1.2cm}|p{1.4cm}| .. flat-table:: Selection target definitions :header-rows: 1
Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst +2 -0
@@ -140,6 +140,8 @@ application should zero out all members except for the *IN* fields. .. c:type:: v4l2_frmsizeenum +.. tabularcolumns:: |p{1.4cm}|p{5.9cm}|p{2.3cm}|p{8.0cm}| + .. flat-table:: struct v4l2_frmsizeenum :header-rows: 0 :stub-columns: 0
Documentation/media/uapi/v4l/vidioc-querycap.rst +1 -1
@@ -133,7 +133,7 @@ specification the ioctl returns an ``EINVAL`` error code. -.. tabularcolumns:: |p{6cm}|p{2.2cm}|p{8.8cm}| +.. tabularcolumns:: |p{6.1cm}|p{2.2cm}|p{8.7cm}| .. _device-capabilities:
Documentation/media/uapi/v4l/vidioc-subscribe-event.rst +2 -2
@@ -40,7 +40,7 @@ Subscribe or unsubscribe V4L2 event. Subscribed events are dequeued by using the :ref:`VIDIOC_DQEVENT` ioctl. -.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}| +.. tabularcolumns:: |p{4.6cm}|p{4.4cm}|p{8.7cm}| .. c:type:: v4l2_event_subscription
@@ -73,7 +73,7 @@ using the :ref:`VIDIOC_DQEVENT` ioctl. -.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| +.. tabularcolumns:: |p{6.8cm}|p{2.2cm}|p{8.5cm}| .. _event-flags:
Signature · 1 line
2.13.5
PATCH 7/12 media: mc uapi: adjust some table sizes for PDF output
In reply to Mauro Carvalho ChehabSome cells are too small to fit the text written to it.
Increase it. No text changes.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst | 2 +- Documentation/media/uapi/mediactl/media-ioc-g-topology.rst | 2 +- Documentation/media/uapi/mediactl/media-types.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst +1 -1
@@ -51,7 +51,7 @@ id's until they get an error. .. c:type:: media_entity_desc -.. tabularcolumns:: |p{1.5cm}|p{1.5cm}|p{1.5cm}|p{1.5cm}|p{11.5cm}| +.. tabularcolumns:: |p{1.5cm}|p{1.7cm}|p{1.6cm}|p{1.5cm}|p{11.2cm}| .. flat-table:: struct media_entity_desc :header-rows: 0
Documentation/media/uapi/mediactl/media-ioc-g-topology.rst +1 -1
@@ -46,7 +46,7 @@ other values untouched. If the ``topology_version`` remains the same, the ioctl should fill the desired arrays with the media graph elements. -.. tabularcolumns:: |p{1.6cm}|p{3.2cm}|p{12.7cm}| +.. tabularcolumns:: |p{1.6cm}|p{3.4cm}|p{12.5cm}| .. c:type:: media_v2_topology
Documentation/media/uapi/mediactl/media-types.rst +1 -1
@@ -5,7 +5,7 @@ Types and flags used to represent the media graph elements ========================================================== -.. tabularcolumns:: |p{8.0cm}|p{10.5cm}| +.. tabularcolumns:: |p{8.2cm}|p{10.3cm}| .. _media-entity-type:
Signature · 1 line
2.13.5
PATCH 8/12 media: cec uapi: Adjust table sizes for PDF output
In reply to Mauro Carvalho ChehabSeveral tables at this media book chapter have issues when PDF is produced. Adjust them.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 7 +++++-- Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 9 +++++---- Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 2 ++ Documentation/media/uapi/cec/cec-ioc-receive.rst | 2 ++ 4 files changed, 14 insertions(+), 6 deletions(-)
Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst +5 -2
@@ -65,7 +65,7 @@ logical address types are already defined will return with error ``EBUSY``. .. c:type:: cec_log_addrs -.. tabularcolumns:: |p{1.0cm}|p{7.5cm}|p{8.0cm}| +.. tabularcolumns:: |p{1.0cm}|p{8.0cm}|p{7.5cm}| .. cssclass:: longtable
@@ -148,6 +148,9 @@ logical address types are already defined will return with error ``EBUSY``. give the CEC framework more information about the device type, even though the framework won't use it directly in the CEC message. + +.. tabularcolumns:: |p{7.8cm}|p{1.0cm}|p{8.7cm}| + .. _cec-log-addrs-flags: .. flat-table:: Flags for struct cec_log_addrs
@@ -183,7 +186,7 @@ logical address types are already defined will return with error ``EBUSY``. All other messages are ignored. -.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| +.. tabularcolumns:: |p{7.8cm}|p{1.0cm}|p{8.7cm}| .. _cec-versions:
Documentation/media/uapi/cec/cec-ioc-dqevent.rst +5 -4
@@ -87,7 +87,7 @@ it is guaranteed that the state did change in between the two events. this is more than enough. -.. tabularcolumns:: |p{1.0cm}|p{4.2cm}|p{2.5cm}|p{8.8cm}| +.. tabularcolumns:: |p{1.0cm}|p{4.4cm}|p{2.5cm}|p{9.6cm}| .. c:type:: cec_event
@@ -98,10 +98,11 @@ it is guaranteed that the state did change in between the two events. * - __u64 - ``ts`` - - :cspan:`1` Timestamp of the event in ns. + - :cspan:`1`\ Timestamp of the event in ns. - The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To access - the same clock from userspace use :c:func:`clock_gettime`. + The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. + + To access the same clock from userspace use :c:func:`clock_gettime`. * - __u32 - ``event`` - :cspan:`1` The CEC event type, see :ref:`cec-events`.
Documentation/media/uapi/cec/cec-ioc-g-mode.rst +2 -0
@@ -108,6 +108,8 @@ Available follower modes are: .. _cec-mode-follower_e: +.. cssclass:: longtable + .. flat-table:: Follower Modes :header-rows: 0 :stub-columns: 0
Documentation/media/uapi/cec/cec-ioc-receive.rst +2 -0
@@ -195,6 +195,8 @@ View On' messages from initiator 0xf ('Unregistered') to destination 0 ('TV'). valid if the :ref:`CEC_TX_STATUS_ERROR <CEC-TX-STATUS-ERROR>` status bit is set. +.. tabularcolumns:: |p{6.2cm}|p{1.0cm}|p{10.3cm}| + .. _cec-msg-flags: .. flat-table:: Flags for struct cec_msg
Signature · 1 line
2.13.5
PATCH 2/12 media: vidioc-querycap: use a more realistic value for KERNEL_VERSION
In reply to Mauro Carvalho ChehabIn the past, V4L2 versions were 0.x.y, but that changed years ago. Since Kernel 3.1, however, the numbering schema was changed to match the Kernel version.
However, the presented example still uses the old numerating schema, with is a misleading information.
So, update it to the new schema.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/v4l/vidioc-querycap.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/media/uapi/v4l/vidioc-querycap.rst +3 -2
@@ -92,12 +92,13 @@ specification the ioctl returns an ``EINVAL`` error code. stack from a newer kernel. The version number is formatted using the ``KERNEL_VERSION()`` - macro: + macro. For example if the media stack corresponds to the V4L2 + version shipped with Kernel 4.14, it would be equivalent to: * - :cspan:`2` ``#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))`` - ``__u32 version = KERNEL_VERSION(0, 8, 1);`` + ``__u32 version = KERNEL_VERSION(4, 14, 0);`` ``printf ("Version: %u.%u.%u\\n",``
Signature · 1 line
2.13.5
PATCH 9/12 media: docs: don't show ToC for each part on PDF output
In reply to Mauro Carvalho ChehabThe "Table of Contents" of a PDF file is generated only once, at the beginning fo the output. It doesn't produce it on each part.
So, don't output this text on each part of the document.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/cec-drivers/index.rst | 4 +++- Documentation/media/dvb-drivers/index.rst | 4 +++- Documentation/media/media_kapi.rst | 4 +++- Documentation/media/media_uapi.rst | 4 +++- Documentation/media/uapi/cec/cec-api.rst | 5 ++++- Documentation/media/uapi/dvb/dvbapi.rst | 4 +++- Documentation/media/uapi/mediactl/media-controller.rst | 4 +++- Documentation/media/uapi/rc/remote_controllers.rst | 4 +++- Documentation/media/uapi/v4l/v4l2.rst | 4 +++- Documentation/media/v4l-drivers/index.rst | 4 +++- 10 files changed, 31 insertions(+), 10 deletions(-)
Documentation/media/cec-drivers/index.rst +3 -1
@@ -21,7 +21,9 @@ more details. For more details see the file COPYING in the source distribution of Linux. -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/dvb-drivers/index.rst +3 -1
@@ -19,7 +19,9 @@ more details. For more details see the file COPYING in the source distribution of Linux. -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/media_kapi.rst +3 -1
@@ -20,7 +20,9 @@ more details. For more details see the file COPYING in the source distribution of Linux. -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/media_uapi.rst +3 -1
@@ -14,7 +14,9 @@ any later version published by the Free Software Foundation. A copy of the license is included in the chapter entitled "GNU Free Documentation License". -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/uapi/cec/cec-api.rst +4 -1
@@ -10,7 +10,10 @@ Part V - Consumer Electronics Control API This part describes the CEC: Consumer Electronics Control -.. class:: toc-title + +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/uapi/dvb/dvbapi.rst +3 -1
@@ -28,7 +28,9 @@ Part II - Digital TV API **Version 5.10** -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/uapi/mediactl/media-controller.rst +3 -1
@@ -8,7 +8,9 @@ Part IV - Media Controller API ############################## -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/uapi/rc/remote_controllers.rst +3 -1
@@ -8,7 +8,9 @@ Part III - Remote Controller API ################################ -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/uapi/v4l/v4l2.rst +3 -1
@@ -11,7 +11,9 @@ This part describes the Video for Linux API version 2 (V4L2 API) specification. **Revision 4.5** -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Documentation/media/v4l-drivers/index.rst +3 -1
@@ -21,7 +21,9 @@ more details. For more details see the file COPYING in the source distribution of Linux. -.. class:: toc-title +.. only:: html + + .. class:: toc-title Table of Contents
Signature · 1 line
2.13.5
PATCH 10/12 media: v4l2-event.rst: adjust table to fit on PDF output
In reply to Mauro Carvalho ChehabThe tables there don't quite fit on PDF output.
Adjust it by adding a tabularcolumns macro.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/kapi/v4l2-event.rst | 2 ++ 1 file changed, 2 insertions(+)
Documentation/media/kapi/v4l2-event.rst +2 -0
@@ -67,6 +67,8 @@ type). The ops argument allows the driver to specify a number of callbacks: +.. tabularcolumns:: |p{1.5cm}|p{16.0cm}| + ======== ============================================================== Callback Description ======== ==============================================================
Signature · 1 line
2.13.5
PATCH 1/12 media: v4l uAPI: add descriptions for arguments to all ioctls
In reply to Mauro Carvalho ChehabSeveral ioctls are missing descriptions for the third argument of the ioctl() command. They should have a description, as otherwise the output won't be ok, and will sound like something is missing.
So, add them.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- Documentation/media/uapi/v4l/vidioc-create-bufs.rst | 1 + Documentation/media/uapi/v4l/vidioc-cropcap.rst | 1 + Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 1 + Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst | 1 + Documentation/media/uapi/v4l/vidioc-dqevent.rst | 1 + Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst | 1 + Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst | 2 +- Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst | 1 + Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 1 + Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst | 5 ++--- Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst | 2 +- Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst | 1 + Documentation/media/uapi/v4l/vidioc-enumaudio.rst | 1 + Documentation/media/uapi/v4l/vidioc-enumaudioout.rst | 1 + Documentation/media/uapi/v4l/vidioc-enuminput.rst | 1 + Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 1 + Documentation/media/uapi/v4l/vidioc-enumstd.rst | 1 + Documentation/media/uapi/v4l/vidioc-expbuf.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-audio.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-audioout.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-crop.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-ctrl.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-edid.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-enc-index.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-frequency.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-input.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-modulator.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-output.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-priority.rst | 2 +- Documentation/media/uapi/v4l/vidioc-g-selection.rst | 5 +---- Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-std.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 1 + Documentation/media/uapi/v4l/vidioc-overlay.rst | 1 + Documentation/media/uapi/v4l/vidioc-prepare-buf.rst | 1 + Documentation/media/uapi/v4l/vidioc-qbuf.rst | 1 + Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst | 1 + Documentation/media/uapi/v4l/vidioc-querybuf.rst | 1 + Documentation/media/uapi/v4l/vidioc-querycap.rst | 1 + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 2 ++ Documentation/media/uapi/v4l/vidioc-querystd.rst | 1 + Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 2 +- Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst | 1 + Documentation/media/uapi/v4l/vidioc-streamon.rst | 2 +- Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst | 1 + Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst | 1 + Documentation/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst | 1 + Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst | 1 + Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst | 1 + Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst | 1 + Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst | 1 + Documentation/media/uapi/v4l/vidioc-subscribe-event.rst | 1 + 58 files changed, 60 insertions(+), 12 deletions(-)
Documentation/media/uapi/v4l/vidioc-create-bufs.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_create_buffers`. Description
Documentation/media/uapi/v4l/vidioc-cropcap.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_cropcap`. Description
Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_dbg_chip_info`. Description
Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_dbg_register`. Description
Documentation/media/uapi/v4l/vidioc-dqevent.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_event`. Description
Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_dv_timings_cap`. Description
Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst +1 -1
@@ -29,7 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` - + Pointer to struct :c:type:`v4l2_encoder_cmd`. Description ===========
Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_enum_dv_timings`. Description
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_fmtdesc`. Description
Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst +2 -3
@@ -26,9 +26,8 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` - Pointer to a struct :c:type:`v4l2_frmivalenum` - structure that contains a pixel format and size and receives a frame - interval. + Pointer to struct :c:type:`v4l2_frmivalenum` + that contains a pixel format and size and receives a frame interval. Description
Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst +1 -1
@@ -26,7 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` - Pointer to a struct :c:type:`v4l2_frmsizeenum` + Pointer to struct :c:type:`v4l2_frmsizeenum` that contains an index and pixel format and receives a frame width and height.
Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_frequency_band`. Description
Documentation/media/uapi/v4l/vidioc-enumaudio.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_audio`. Description
Documentation/media/uapi/v4l/vidioc-enumaudioout.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_audioout`. Description
Documentation/media/uapi/v4l/vidioc-enuminput.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_input`. Description
Documentation/media/uapi/v4l/vidioc-enumoutput.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_output`. Description
Documentation/media/uapi/v4l/vidioc-enumstd.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_standard`. Description
Documentation/media/uapi/v4l/vidioc-expbuf.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_exportbuffer`. Description
Documentation/media/uapi/v4l/vidioc-g-audio.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_audio`. Description
Documentation/media/uapi/v4l/vidioc-g-audioout.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_audioout`. Description
Documentation/media/uapi/v4l/vidioc-g-crop.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_crop`. Description
Documentation/media/uapi/v4l/vidioc-g-ctrl.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_control`. Description
Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst +1 -0
@@ -35,6 +35,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_dv_timings`. Description
Documentation/media/uapi/v4l/vidioc-g-edid.rst +1 -0
@@ -36,6 +36,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_edid`. Description
Documentation/media/uapi/v4l/vidioc-g-enc-index.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_enc_idx`. Description
Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst +1 -0
@@ -34,6 +34,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_ext_controls`. Description
Documentation/media/uapi/v4l/vidioc-g-fbuf.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_framebuffer`. Description
Documentation/media/uapi/v4l/vidioc-g-fmt.rst +1 -0
@@ -31,6 +31,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_format`. Description
Documentation/media/uapi/v4l/vidioc-g-frequency.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_frequency`. Description
Documentation/media/uapi/v4l/vidioc-g-input.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer an integer with input index. Description
Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_jpegcompression`. Description
Documentation/media/uapi/v4l/vidioc-g-modulator.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_modulator`. Description
Documentation/media/uapi/v4l/vidioc-g-output.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to an integer with output index. Description
Documentation/media/uapi/v4l/vidioc-g-parm.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_streamparm`. Description
Documentation/media/uapi/v4l/vidioc-g-priority.rst +1 -1
@@ -29,7 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` - Pointer to an enum v4l2_priority type. + Pointer to an enum :c:type:`v4l2_priority` type. Description
Documentation/media/uapi/v4l/vidioc-g-selection.rst +1 -4
@@ -29,11 +29,8 @@ Arguments ``fd`` File descriptor returned by :ref:`open() <func-open>`. -``request`` - VIDIOC_G_SELECTION, VIDIOC_S_SELECTION - ``argp`` - + Pointer to struct :c:type:`v4l2_selection`. Description ===========
Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_sliced_vbi_cap`. Description
Documentation/media/uapi/v4l/vidioc-g-std.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to :c:type:`v4l2_std_id`. Description
Documentation/media/uapi/v4l/vidioc-g-tuner.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_tuner`. Description
Documentation/media/uapi/v4l/vidioc-overlay.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to an integer. Description
Documentation/media/uapi/v4l/vidioc-prepare-buf.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_buffer`. Description
Documentation/media/uapi/v4l/vidioc-qbuf.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_buffer`. Description
Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_dv_timings`. Description
Documentation/media/uapi/v4l/vidioc-querybuf.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_buffer`. Description
Documentation/media/uapi/v4l/vidioc-querycap.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_capability`. Description
Documentation/media/uapi/v4l/vidioc-queryctrl.rst +2 -0
@@ -32,6 +32,8 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_queryctl`, :c:type:`v4l2_query_ext_ctrl` + or :c:type`v4l2_querymenu` (depending on the ioctl). Description
Documentation/media/uapi/v4l/vidioc-querystd.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to :c:type:`v4l2_std_id`. Description
Documentation/media/uapi/v4l/vidioc-reqbufs.rst +1 -1
@@ -26,7 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` - + Pointer to struct :c:type:`v4l2_requestbuffers`. Description ===========
Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_hw_freq_seek`. Description
Documentation/media/uapi/v4l/vidioc-streamon.rst +1 -1
@@ -29,7 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` - + Pointer to an integer. Description ===========
Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-interval.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_subdev_frame_interval_enum`. Description
Documentation/media/uapi/v4l/vidioc-subdev-enum-frame-size.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_subdev_frame_size_enum`. Description
Documentation/media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst +1 -0
@@ -26,6 +26,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_subdev_mbus_code_enum`. Description
Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_subdev_crop`. Description
Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_subdev_format`. Description
Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_subdev_frame_interval`. Description
Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst +1 -0
@@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_subdev_selection`. Description
Documentation/media/uapi/v4l/vidioc-subscribe-event.rst +1 -0
@@ -30,6 +30,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_event_subscription`. Description
Signature · 1 line
2.13.5
PATCH 11/12 media: em28xx-cardlist.rst: update to reflect last changes
In reply to Mauro Carvalho ChehabThere were some new board additions. Update the cardlist accordingly.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- .../media/v4l-drivers/em28xx-cardlist.rst | 210 +++++++++++---------- 1 file changed, 106 insertions(+), 104 deletions(-)
Documentation/media/v4l-drivers/em28xx-cardlist.rst +106 -104
@@ -1,107 +1,109 @@ EM28xx cards list ================= -=========== ==================================================================== ================ ================================================================================================================================== -Card number Card name Empia Chip USB IDs -=========== ==================================================================== ================ ================================================================================================================================== -0 Unknown EM2800 video grabber em2800 eb1a:2800 -1 Unknown EM2750/28xx video grabber em2820 or em2840 eb1a:2710, eb1a:2820, eb1a:2821, eb1a:2860, eb1a:2861, eb1a:2862, eb1a:2863, eb1a:2870, eb1a:2881, eb1a:2883, eb1a:2868, eb1a:2875 -2 Terratec Cinergy 250 USB em2820 or em2840 0ccd:0036 -3 Pinnacle PCTV USB 2 em2820 or em2840 2304:0208 -4 Hauppauge WinTV USB 2 em2820 or em2840 2040:4200, 2040:4201 -5 MSI VOX USB 2.0 em2820 or em2840 -6 Terratec Cinergy 200 USB em2800 -7 Leadtek Winfast USB II em2800 0413:6023 -8 Kworld USB2800 em2800 -9 Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker em2820 or em2840 1b80:e302, 1b80:e304, 2304:0207, 2304:021a, 093b:a003 -10 Hauppauge WinTV HVR 900 em2880 2040:6500 -11 Terratec Hybrid XS em2880 -12 Kworld PVR TV 2800 RF em2820 or em2840 -13 Terratec Prodigy XS em2880 -14 SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0 em2820 or em2840 -15 V-Gear PocketTV em2800 -16 Hauppauge WinTV HVR 950 em2883 2040:6513, 2040:6517, 2040:651b -17 Pinnacle PCTV HD Pro Stick em2880 2304:0227 -18 Hauppauge WinTV HVR 900 (R2) em2880 2040:6502 -19 EM2860/SAA711X Reference Design em2860 -20 AMD ATI TV Wonder HD 600 em2880 0438:b002 -21 eMPIA Technology, Inc. GrabBeeX+ Video Encoder em2800 eb1a:2801 -22 EM2710/EM2750/EM2751 webcam grabber em2750 eb1a:2750, eb1a:2751 -23 Huaqi DLCW-130 em2750 -24 D-Link DUB-T210 TV Tuner em2820 or em2840 2001:f112 -25 Gadmei UTV310 em2820 or em2840 -26 Hercules Smart TV USB 2.0 em2820 or em2840 -27 Pinnacle PCTV USB 2 (Philips FM1216ME) em2820 or em2840 -28 Leadtek Winfast USB II Deluxe em2820 or em2840 -29 EM2860/TVP5150 Reference Design em2860 -30 Videology 20K14XUSB USB2.0 em2820 or em2840 -31 Usbgear VD204v9 em2821 -32 Supercomp USB 2.0 TV em2821 -33 Elgato Video Capture em2860 0fd9:0033 -34 Terratec Cinergy A Hybrid XS em2860 0ccd:004f -35 Typhoon DVD Maker em2860 -36 NetGMBH Cam em2860 -37 Gadmei UTV330 em2860 eb1a:50a6 -38 Yakumo MovieMixer em2861 -39 KWorld PVRTV 300U em2861 eb1a:e300 -40 Plextor ConvertX PX-TV100U em2861 093b:a005 -41 Kworld 350 U DVB-T em2870 eb1a:e350 -42 Kworld 355 U DVB-T em2870 eb1a:e355, eb1a:e357, eb1a:e359 -43 Terratec Cinergy T XS em2870 -44 Terratec Cinergy T XS (MT2060) em2870 0ccd:0043 -45 Pinnacle PCTV DVB-T em2870 -46 Compro, VideoMate U3 em2870 185b:2870 -47 KWorld DVB-T 305U em2880 eb1a:e305 -48 KWorld DVB-T 310U em2880 -49 MSI DigiVox A/D em2880 eb1a:e310 -50 MSI DigiVox A/D II em2880 eb1a:e320 -51 Terratec Hybrid XS Secam em2880 0ccd:004c -52 DNT DA2 Hybrid em2881 -53 Pinnacle Hybrid Pro em2881 -54 Kworld VS-DVB-T 323UR em2882 eb1a:e323 -55 Terratec Cinnergy Hybrid T USB XS (em2882) em2882 0ccd:005e, 0ccd:0042 -56 Pinnacle Hybrid Pro (330e) em2882 2304:0226 -57 Kworld PlusTV HD Hybrid 330 em2883 eb1a:a316 -58 Compro VideoMate ForYou/Stereo em2820 or em2840 185b:2041 -59 Pinnacle PCTV HD Mini em2874 2304:023f -60 Hauppauge WinTV HVR 850 em2883 2040:651f -61 Pixelview PlayTV Box 4 USB 2.0 em2820 or em2840 -62 Gadmei TVR200 em2820 or em2840 -63 Kaiomy TVnPC U2 em2860 eb1a:e303 -64 Easy Cap Capture DC-60 em2860 1b80:e309 -65 IO-DATA GV-MVP/SZ em2820 or em2840 04bb:0515 -66 Empire dual TV em2880 -67 Terratec Grabby em2860 0ccd:0096, 0ccd:10AF -68 Terratec AV350 em2860 0ccd:0084 -69 KWorld ATSC 315U HDTV TV Box em2882 eb1a:a313 -70 Evga inDtube em2882 -71 Silvercrest Webcam 1.3mpix em2820 or em2840 -72 Gadmei UTV330+ em2861 -73 Reddo DVB-C USB TV Box em2870 -74 Actionmaster/LinXcel/Digitus VC211A em2800 -75 Dikom DK300 em2882 -76 KWorld PlusTV 340U or UB435-Q (ATSC) em2870 1b80:a340 -77 EM2874 Leadership ISDBT em2874 -78 PCTV nanoStick T2 290e em28174 2013:024f -79 Terratec Cinergy H5 em2884 eb1a:2885, 0ccd:10a2, 0ccd:10ad, 0ccd:10b6 -80 PCTV DVB-S2 Stick (460e) em28174 2013:024c -81 Hauppauge WinTV HVR 930C em2884 2040:1605 -82 Terratec Cinergy HTC Stick em2884 0ccd:00b2 -83 Honestech Vidbox NW03 em2860 eb1a:5006 -84 MaxMedia UB425-TC em2874 1b80:e425 -85 PCTV QuatroStick (510e) em2884 2304:0242 -86 PCTV QuatroStick nano (520e) em2884 2013:0251 -87 Terratec Cinergy HTC USB XS em2884 0ccd:008e, 0ccd:00ac -88 C3 Tech Digital Duo HDTV/SDTV USB em2884 1b80:e755 -89 Delock 61959 em2874 1b80:e1cc -90 KWorld USB ATSC TV Stick UB435-Q V2 em2874 1b80:e346 -91 SpeedLink Vicious And Devine Laplace webcam em2765 1ae7:9003, 1ae7:9004 -92 PCTV DVB-S2 Stick (461e) em28178 2013:0258 -93 KWorld USB ATSC TV Stick UB435-Q V3 em2874 1b80:e34c -94 PCTV tripleStick (292e) em28178 2013:025f, 2040:0264 -95 Leadtek VC100 em2861 0413:6f07 -96 Terratec Cinergy T2 Stick HD em28178 eb1a:8179 -97 Elgato EyeTV Hybrid 2008 INT em2884 0fd9:0018 -98 PLEX PX-BCUD em28178 3275:0085 -99 Hauppauge WinTV-dualHD DVB em28174 2040:0265 -=========== ==================================================================== ================ ================================================================================================================================== +=========== ===================================================================================================================== ================ ================================================================================================================================== +Card number Card name Empia Chip USB IDs +=========== ===================================================================================================================== ================ ================================================================================================================================== +0 Unknown EM2800 video grabber em2800 eb1a:2800 +1 Unknown EM2750/28xx video grabber em2820 or em2840 eb1a:2710, eb1a:2820, eb1a:2821, eb1a:2860, eb1a:2861, eb1a:2862, eb1a:2863, eb1a:2870, eb1a:2881, eb1a:2883, eb1a:2868, eb1a:2875 +2 Terratec Cinergy 250 USB em2820 or em2840 0ccd:0036 +3 Pinnacle PCTV USB 2 em2820 or em2840 2304:0208 +4 Hauppauge WinTV USB 2 em2820 or em2840 2040:4200, 2040:4201 +5 MSI VOX USB 2.0 em2820 or em2840 +6 Terratec Cinergy 200 USB em2800 +7 Leadtek Winfast USB II em2800 0413:6023 +8 Kworld USB2800 em2800 +9 Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker / Kworld DVD Maker 2 / Plextor ConvertX PX-AV100U em2820 or em2840 1b80:e302, 1b80:e304, 2304:0207, 2304:021a, 093b:a003 +10 Hauppauge WinTV HVR 900 em2880 2040:6500 +11 Terratec Hybrid XS em2880 +12 Kworld PVR TV 2800 RF em2820 or em2840 +13 Terratec Prodigy XS em2880 +14 SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0 em2820 or em2840 +15 V-Gear PocketTV em2800 +16 Hauppauge WinTV HVR 950 em2883 2040:6513, 2040:6517, 2040:651b +17 Pinnacle PCTV HD Pro Stick em2880 2304:0227 +18 Hauppauge WinTV HVR 900 (R2) em2880 2040:6502 +19 EM2860/SAA711X Reference Design em2860 +20 AMD ATI TV Wonder HD 600 em2880 0438:b002 +21 eMPIA Technology, Inc. GrabBeeX+ Video Encoder em2800 eb1a:2801 +22 EM2710/EM2750/EM2751 webcam grabber em2750 eb1a:2750, eb1a:2751 +23 Huaqi DLCW-130 em2750 +24 D-Link DUB-T210 TV Tuner em2820 or em2840 2001:f112 +25 Gadmei UTV310 em2820 or em2840 +26 Hercules Smart TV USB 2.0 em2820 or em2840 +27 Pinnacle PCTV USB 2 (Philips FM1216ME) em2820 or em2840 +28 Leadtek Winfast USB II Deluxe em2820 or em2840 +29 EM2860/TVP5150 Reference Design em2860 eb1a:5051 +30 Videology 20K14XUSB USB2.0 em2820 or em2840 +31 Usbgear VD204v9 em2821 +32 Supercomp USB 2.0 TV em2821 +33 Elgato Video Capture em2860 0fd9:0033 +34 Terratec Cinergy A Hybrid XS em2860 0ccd:004f +35 Typhoon DVD Maker em2860 +36 NetGMBH Cam em2860 +37 Gadmei UTV330 em2860 eb1a:50a6 +38 Yakumo MovieMixer em2861 +39 KWorld PVRTV 300U em2861 eb1a:e300 +40 Plextor ConvertX PX-TV100U em2861 093b:a005 +41 Kworld 350 U DVB-T em2870 eb1a:e350 +42 Kworld 355 U DVB-T em2870 eb1a:e355, eb1a:e357, eb1a:e359 +43 Terratec Cinergy T XS em2870 +44 Terratec Cinergy T XS (MT2060) em2870 0ccd:0043 +45 Pinnacle PCTV DVB-T em2870 +46 Compro, VideoMate U3 em2870 185b:2870 +47 KWorld DVB-T 305U em2880 eb1a:e305 +48 KWorld DVB-T 310U em2880 +49 MSI DigiVox A/D em2880 eb1a:e310 +50 MSI DigiVox A/D II em2880 eb1a:e320 +51 Terratec Hybrid XS Secam em2880 0ccd:004c +52 DNT DA2 Hybrid em2881 +53 Pinnacle Hybrid Pro em2881 +54 Kworld VS-DVB-T 323UR em2882 eb1a:e323 +55 Terratec Cinnergy Hybrid T USB XS (em2882) em2882 0ccd:005e, 0ccd:0042 +56 Pinnacle Hybrid Pro (330e) em2882 2304:0226 +57 Kworld PlusTV HD Hybrid 330 em2883 eb1a:a316 +58 Compro VideoMate ForYou/Stereo em2820 or em2840 185b:2041 +59 Pinnacle PCTV HD Mini em2874 2304:023f +60 Hauppauge WinTV HVR 850 em2883 2040:651f +61 Pixelview PlayTV Box 4 USB 2.0 em2820 or em2840 +62 Gadmei TVR200 em2820 or em2840 +63 Kaiomy TVnPC U2 em2860 eb1a:e303 +64 Easy Cap Capture DC-60 em2860 1b80:e309 +65 IO-DATA GV-MVP/SZ em2820 or em2840 04bb:0515 +66 Empire dual TV em2880 +67 Terratec Grabby em2860 0ccd:0096, 0ccd:10AF +68 Terratec AV350 em2860 0ccd:0084 +69 KWorld ATSC 315U HDTV TV Box em2882 eb1a:a313 +70 Evga inDtube em2882 +71 Silvercrest Webcam 1.3mpix em2820 or em2840 +72 Gadmei UTV330+ em2861 +73 Reddo DVB-C USB TV Box em2870 +74 Actionmaster/LinXcel/Digitus VC211A em2800 +75 Dikom DK300 em2882 +76 KWorld PlusTV 340U or UB435-Q (ATSC) em2870 1b80:a340 +77 EM2874 Leadership ISDBT em2874 +78 PCTV nanoStick T2 290e em28174 2013:024f +79 Terratec Cinergy H5 em2884 eb1a:2885, 0ccd:10a2, 0ccd:10ad, 0ccd:10b6 +80 PCTV DVB-S2 Stick (460e) em28174 2013:024c +81 Hauppauge WinTV HVR 930C em2884 2040:1605 +82 Terratec Cinergy HTC Stick em2884 0ccd:00b2 +83 Honestech Vidbox NW03 em2860 eb1a:5006 +84 MaxMedia UB425-TC em2874 1b80:e425 +85 PCTV QuatroStick (510e) em2884 2304:0242 +86 PCTV QuatroStick nano (520e) em2884 2013:0251 +87 Terratec Cinergy HTC USB XS em2884 0ccd:008e, 0ccd:00ac +88 C3 Tech Digital Duo HDTV/SDTV USB em2884 1b80:e755 +89 Delock 61959 em2874 1b80:e1cc +90 KWorld USB ATSC TV Stick UB435-Q V2 em2874 1b80:e346 +91 SpeedLink Vicious And Devine Laplace webcam em2765 1ae7:9003, 1ae7:9004 +92 PCTV DVB-S2 Stick (461e) em28178 2013:0258 +93 KWorld USB ATSC TV Stick UB435-Q V3 em2874 1b80:e34c +94 PCTV tripleStick (292e) em28178 2013:025f, 2040:0264 +95 Leadtek VC100 em2861 0413:6f07 +96 Terratec Cinergy T2 Stick HD em28178 eb1a:8179 +97 Elgato EyeTV Hybrid 2008 INT em2884 0fd9:0018 +98 PLEX PX-BCUD em28178 3275:0085 +99 Hauppauge WinTV-dualHD DVB em28174 2040:0265 +100 Hauppauge WinTV-dualHD 01595 ATSC/QAM em28174 2040:026d +101 Terratec Cinergy H6 rev. 2 em2884 0ccd:10b2 +=========== ===================================================================================================================== ================ ==================================================================================================================================
Signature · 1 line
2.13.5
cover media documentation ReST fixes
This series contain media documentation ReST fixes, mostly related to table parsing and the corresponding PDF output (tested with Sphinx 1.4).
It also contains a few documentation trivial improvements, from a few minor issues I noticed when reading the PDF output text on some places.
Probably the most important one is a regression that was causing the media book build to return an error, introduced by changeset 70b074df4ed1 ("media: fix pdf build with Spinx 1.6").
My plan is to merge this patch series soon via the media tree, and send it upstream during this merge window.
Markus,
Perhaps you could take a look on it. It is related to the usage of cspan and the corresponding PDF output.
Mauro Carvalho Chehab (12):
media: v4l uAPI: add descriptions for arguments to all ioctls
media: vidioc-querycap: use a more realistic value for KERNEL_VERSION
media: vidioc-g-tuner.rst: Fix table number of cols
media: v4l uAPI docs: adjust some tables for PDF output
media: docs: fix PDF build with Sphinx 1.4
media: rc-sysfs-nodes.rst: better use literals
media: mc uapi: adjust some table sizes for PDF output
media: cec uapi: Adjust table sizes for PDF output
media: docs: don't show ToC for each part on PDF output
media: v4l2-event.rst: adjust table to fit on PDF output
media: em28xx-cardlist.rst: update to reflect last changes
media: docs-rst: cardlists: change their format to flat-tables
Documentation/media/cec-drivers/index.rst | 4 +- Documentation/media/dvb-drivers/index.rst | 4 +- Documentation/media/kapi/v4l2-event.rst | 2 + Documentation/media/media_kapi.rst | 4 +- Documentation/media/media_uapi.rst | 4 +- Documentation/media/uapi/cec/cec-api.rst | 5 +- .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 7 +- Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 9 +- Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 2 + Documentation/media/uapi/cec/cec-ioc-receive.rst | 2 + Documentation/media/uapi/dvb/dvbapi.rst | 4 +- .../media/uapi/mediactl/media-controller.rst | 4 +- .../uapi/mediactl/media-ioc-enum-entities.rst | 2 +- .../media/uapi/mediactl/media-ioc-g-topology.rst | 2 +- Documentation/media/uapi/mediactl/media-types.rst | 2 +- Documentation/media/uapi/rc/rc-sysfs-nodes.rst | 10 +- Documentation/media/uapi/rc/remote_controllers.rst | 4 +- Documentation/media/uapi/v4l/colorspaces-defs.rst | 2 + Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 6 +- Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 3 +- Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 2 +- .../media/uapi/v4l/v4l2-selection-targets.rst | 2 +- Documentation/media/uapi/v4l/v4l2.rst | 4 +- .../media/uapi/v4l/vidioc-create-bufs.rst | 1 + Documentation/media/uapi/v4l/vidioc-cropcap.rst | 1 + .../media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 1 + .../media/uapi/v4l/vidioc-dbg-g-register.rst | 1 + Documentation/media/uapi/v4l/vidioc-dqevent.rst | 1 + .../media/uapi/v4l/vidioc-dv-timings-cap.rst | 1 + .../media/uapi/v4l/vidioc-encoder-cmd.rst | 2 +- .../media/uapi/v4l/vidioc-enum-dv-timings.rst | 1 + Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 1 + .../media/uapi/v4l/vidioc-enum-frameintervals.rst | 5 +- .../media/uapi/v4l/vidioc-enum-framesizes.rst | 4 +- .../media/uapi/v4l/vidioc-enum-freq-bands.rst | 1 + Documentation/media/uapi/v4l/vidioc-enumaudio.rst | 1 + .../media/uapi/v4l/vidioc-enumaudioout.rst | 1 + Documentation/media/uapi/v4l/vidioc-enuminput.rst | 1 + Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 1 + Documentation/media/uapi/v4l/vidioc-enumstd.rst | 1 + Documentation/media/uapi/v4l/vidioc-expbuf.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-audio.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-audioout.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-crop.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-ctrl.rst | 1 + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-edid.rst | 1 + .../media/uapi/v4l/vidioc-g-enc-index.rst | 1 + .../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 1 + .../media/uapi/v4l/vidioc-g-frequency.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-input.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst | 1 + .../media/uapi/v4l/vidioc-g-modulator.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-output.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-priority.rst | 2 +- .../media/uapi/v4l/vidioc-g-selection.rst | 5 +- .../media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-std.rst | 1 + Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 10 +- Documentation/media/uapi/v4l/vidioc-overlay.rst | 1 + .../media/uapi/v4l/vidioc-prepare-buf.rst | 1 + Documentation/media/uapi/v4l/vidioc-qbuf.rst | 1 + .../media/uapi/v4l/vidioc-query-dv-timings.rst | 1 + Documentation/media/uapi/v4l/vidioc-querybuf.rst | 1 + Documentation/media/uapi/v4l/vidioc-querycap.rst | 8 +- Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 2 + Documentation/media/uapi/v4l/vidioc-querystd.rst | 1 + Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 2 +- .../media/uapi/v4l/vidioc-s-hw-freq-seek.rst | 1 + Documentation/media/uapi/v4l/vidioc-streamon.rst | 2 +- .../uapi/v4l/vidioc-subdev-enum-frame-interval.rst | 1 + .../uapi/v4l/vidioc-subdev-enum-frame-size.rst | 1 + .../uapi/v4l/vidioc-subdev-enum-mbus-code.rst | 1 + .../media/uapi/v4l/vidioc-subdev-g-crop.rst | 1 + .../media/uapi/v4l/vidioc-subdev-g-fmt.rst | 1 + .../uapi/v4l/vidioc-subdev-g-frame-interval.rst | 1 + .../media/uapi/v4l/vidioc-subdev-g-selection.rst | 1 + .../media/uapi/v4l/vidioc-subscribe-event.rst | 5 +- .../media/v4l-drivers/au0828-cardlist.rst | 44 +- Documentation/media/v4l-drivers/bttv-cardlist.rst | 849 +++++++++++++---- .../media/v4l-drivers/cx23885-cardlist.rst | 304 +++++-- Documentation/media/v4l-drivers/cx88-cardlist.rst | 469 ++++++++-- .../media/v4l-drivers/em28xx-cardlist.rst | 523 ++++++++--- Documentation/media/v4l-drivers/index.rst | 4 +- Documentation/media/v4l-drivers/ivtv-cardlist.rst | 169 +++- .../media/v4l-drivers/saa7134-cardlist.rst | 999 ++++++++++++++++----- .../media/v4l-drivers/saa7164-cardlist.rst | 84 +- .../media/v4l-drivers/tm6000-cardlist.rst | 99 +- .../media/v4l-drivers/usbvision-cardlist.rst | 349 +++++-- 92 files changed, 3240 insertions(+), 837 deletions(-)
Signature · 1 line
2.13.5
PATCH 12/12 media: docs-rst: cardlists: change their format to flat-tables
Most tables there don't fit on 80 columns. Some are very big.
While those tables are actually generated via scripts, every time a new board is added, the entire table could be reformatted.
Quoted 1 line
From the diffstat PoV, that's bad, as it is hard to see what
happened.
One such example is at changeset 4868f6e1fce6 ("media:em28xx-cardlist.rst: update to reflect last changes"):
The USB ID for "Plextor ConvertX PX-AV100U" was added to card number 9, with caused the entire table to be reformatted.
So, instead, use flat-tables. While here, fix PDF output, by adding tablecolumns to the tables that need it.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
--- .../media/v4l-drivers/au0828-cardlist.rst | 44 +- Documentation/media/v4l-drivers/bttv-cardlist.rst | 849 +++++++++++++---- .../media/v4l-drivers/cx23885-cardlist.rst | 304 +++++-- Documentation/media/v4l-drivers/cx88-cardlist.rst | 469 ++++++++-- .../media/v4l-drivers/em28xx-cardlist.rst | 525 ++++++++--- Documentation/media/v4l-drivers/ivtv-cardlist.rst | 169 +++- .../media/v4l-drivers/saa7134-cardlist.rst | 999 ++++++++++++++++----- .../media/v4l-drivers/saa7164-cardlist.rst | 84 +- .../media/v4l-drivers/tm6000-cardlist.rst | 99 +- .../media/v4l-drivers/usbvision-cardlist.rst | 349 +++++-- 10 files changed, 3101 insertions(+), 790 deletions(-)
Documentation/media/v4l-drivers/au0828-cardlist.rst +34 -10
@@ -1,13 +1,37 @@ AU0828 cards list ================= -=========== ========================== ======================================================================================================================= -Card number Card name USB IDs -=========== ========================== ======================================================================================================================= -0 Unknown board -1 Hauppauge HVR950Q 2040:7200, 2040:7210, 2040:7217, 2040:721b, 2040:721e, 2040:721f, 2040:7280, 0fd9:0008, 2040:7260, 2040:7213, 2040:7270 -2 Hauppauge HVR850 2040:7240 -3 DViCO FusionHDTV USB 0fe9:d620 -4 Hauppauge HVR950Q rev xxF8 2040:7201, 2040:7211, 2040:7281 -5 Hauppauge Woodbury 05e1:0480, 2040:8200 -=========== ========================== ======================================================================================================================= +.. tabularcolumns:: |p{1.4cm}|p{6.5cm}|p{10.0cm}| + +.. flat-table:: + :header-rows: 1 + :widths: 2 19 18 + :stub-columns: 0 + + * - Card number + - Card name + - USB IDs + + * - 0 + - Unknown board + - + + * - 1 + - Hauppauge HVR950Q + - 2040:7200, 2040:7210, 2040:7217, 2040:721b, 2040:721e, 2040:721f, 2040:7280, 0fd9:0008, 2040:7260, 2040:7213, 2040:7270 + + * - 2 + - Hauppauge HVR850 + - 2040:7240 + + * - 3 + - DViCO FusionHDTV USB + - 0fe9:d620 + + * - 4 + - Hauppauge HVR950Q rev xxF8 + - 2040:7201, 2040:7211, 2040:7281 + + * - 5 + - Hauppauge Woodbury + - 05e1:0480, 2040:8200
Documentation/media/v4l-drivers/bttv-cardlist.rst +678 -171
852 lines not on this page · raw message
Documentation/media/v4l-drivers/cx23885-cardlist.rst +242 -62
307 lines not on this page · raw message
Documentation/media/v4l-drivers/cx88-cardlist.rst +374 -95
472 lines not on this page · raw message
Documentation/media/v4l-drivers/em28xx-cardlist.rst +419 -106
528 lines not on this page · raw message
Documentation/media/v4l-drivers/ivtv-cardlist.rst +134 -35
172 lines not on this page · raw message
Documentation/media/v4l-drivers/saa7134-cardlist.rst +798 -201
622 lines not on this page · raw message
Documentation/media/v4l-drivers/saa7164-cardlist.rst +66 -18
84 lines not on this page · raw message
Documentation/media/v4l-drivers/tm6000-cardlist.rst +78 -21
99 lines not on this page · raw message
Documentation/media/v4l-drivers/usbvision-cardlist.rst +278 -71
349 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.13.5
Part of the diff is not shown here. View the raw message.