From fa92b04d98e7c52038c1eb1cbf89ba0ba8679a94 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 19 Aug 2016 11:14:23 -0300 Subject: [media] docs-rst: fix warnings introduced by LaTeX patchset Sphinx is really pedantic with respect to the order where table tags and references are created. Putting things at the wrong order causes troubles. The order that seems to work is: .. raw:: latex .. tabularcolumns:: .. _foo_name: .. cssclass: longtable .. flat-table:: Reorder the tags to the above order, to avoid troubles, and fix remaining warnings introduced by media recent patches. Signed-off-by: Mauro Carvalho Chehab --- Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst | 6 ++---- .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 17 +++++++---------- Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 15 +++++---------- Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 9 +++------ Documentation/media/uapi/cec/cec-ioc-receive.rst | 10 ++++------ 5 files changed, 21 insertions(+), 36 deletions(-) (limited to 'Documentation/media/uapi/cec') diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst index e0eaada..89ba813 100644 --- a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst +++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst @@ -41,11 +41,10 @@ device information, applications call the ioctl with a pointer to a struct :ref:`cec_caps `. The driver fills the structure and returns the information to the application. The ioctl never fails. +.. tabularcolumns:: |p{1.2cm}|p{2.5cm}|p{13.8cm}| .. _cec-caps: -.. tabularcolumns:: |p{1.2cm}|p{2.5cm}|p{13.8cm}| - .. flat-table:: struct cec_caps :header-rows: 0 :stub-columns: 0 @@ -88,11 +87,10 @@ returns the information to the application. The ioctl never fails. macro. +.. tabularcolumns:: |p{4.4cm}|p{2.5cm}|p{10.6cm}| .. _cec-capabilities: -.. tabularcolumns:: |p{4.4cm}|p{2.5cm}|p{10.6cm}| - .. flat-table:: CEC Capabilities Flags :header-rows: 0 :stub-columns: 0 diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst index 959e920..42f8e85 100644 --- a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst +++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst @@ -66,11 +66,10 @@ logical addresses are claimed or cleared. Attempting to call :ref:`ioctl CEC_ADAP_S_LOG_ADDRS ` when logical address types are already defined will return with error ``EBUSY``. +.. tabularcolumns:: |p{1.0cm}|p{7.5cm}|p{8.0cm}| .. _cec-log-addrs: -.. tabularcolumns:: |p{1.0cm}|p{7.5cm}|p{8.0cm}| - .. cssclass:: longtable .. flat-table:: struct cec_log_addrs @@ -207,10 +206,10 @@ 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. -.. _cec-versions: - .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| +.. _cec-versions: + .. flat-table:: CEC Versions :header-rows: 0 :stub-columns: 0 @@ -242,11 +241,10 @@ logical address types are already defined will return with error ``EBUSY``. - CEC version according to the HDMI 2.0 standard. +.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| .. _cec-prim-dev-types: -.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| - .. flat-table:: CEC Primary Device Types :header-rows: 0 :stub-columns: 0 @@ -310,11 +308,10 @@ logical address types are already defined will return with error ``EBUSY``. - Use for a video processor device. +.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| .. _cec-log-addr-types: -.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| - .. flat-table:: CEC Logical Address Types :header-rows: 0 :stub-columns: 0 @@ -381,10 +378,10 @@ logical address types are already defined will return with error ``EBUSY``. -.. _cec-all-dev-types-flags: - .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}| +.. _cec-all-dev-types-flags: + .. flat-table:: CEC All Device Types Flags :header-rows: 0 :stub-columns: 0 diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst index c27b568..f606d2f 100644 --- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst +++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst @@ -51,11 +51,10 @@ two :ref:`CEC_EVENT_STATE_CHANGE ` events with the same state). In that case the intermediate state changes were lost but it is guaranteed that the state did change in between the two events. +.. tabularcolumns:: |p{1.2cm}|p{2.9cm}|p{13.4cm}| .. _cec-event-state-change_s: -.. tabularcolumns:: |p{1.2cm}|p{2.9cm}|p{13.4cm}| - .. flat-table:: struct cec_event_state_change :header-rows: 0 :stub-columns: 0 @@ -79,11 +78,10 @@ it is guaranteed that the state did change in between the two events. - The current set of claimed logical addresses. +.. tabularcolumns:: |p{1.0cm}|p{2.0cm}|p{14.5cm}| .. _cec-event-lost-msgs_s: -.. tabularcolumns:: |p{1.0cm}|p{2.0cm}|p{14.5cm}| - .. flat-table:: struct cec_event_lost_msgs :header-rows: 0 :stub-columns: 0 @@ -107,11 +105,10 @@ 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}| .. _cec-event: -.. tabularcolumns:: |p{1.0cm}|p{4.2cm}|p{2.5cm}|p{8.8cm}| - .. flat-table:: struct cec_event :header-rows: 0 :stub-columns: 0 @@ -175,11 +172,10 @@ it is guaranteed that the state did change in between the two events. event. +.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| .. _cec-events: -.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| - .. flat-table:: CEC Events Types :header-rows: 0 :stub-columns: 0 @@ -206,11 +202,10 @@ it is guaranteed that the state did change in between the two events. application didn't dequeue CEC messages fast enough. +.. tabularcolumns:: |p{6.0cm}|p{0.6cm}|p{10.9cm}| .. _cec-event-flags: -.. tabularcolumns:: |p{6.0cm}|p{0.6cm}|p{10.9cm}| - .. flat-table:: CEC Event Flags :header-rows: 0 :stub-columns: 0 diff --git a/Documentation/media/uapi/cec/cec-ioc-g-mode.rst b/Documentation/media/uapi/cec/cec-ioc-g-mode.rst index 32261e0..b75ed70 100644 --- a/Documentation/media/uapi/cec/cec-ioc-g-mode.rst +++ b/Documentation/media/uapi/cec/cec-ioc-g-mode.rst @@ -73,11 +73,10 @@ always call :ref:`ioctl CEC_TRANSMIT `. Available initiator modes are: +.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| .. _cec-mode-initiator_e: -.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| - .. flat-table:: Initiator Modes :header-rows: 0 :stub-columns: 0 @@ -118,11 +117,10 @@ Available initiator modes are: Available follower modes are: +.. tabularcolumns:: |p{6.6cm}|p{0.9cm}|p{10.0cm}| .. _cec-mode-follower_e: -.. tabularcolumns:: |p{6.6cm}|p{0.9cm}|p{10.0cm}| - .. flat-table:: Follower Modes :header-rows: 0 :stub-columns: 0 @@ -212,11 +210,10 @@ Available follower modes are: Core message processing details: +.. tabularcolumns:: |p{6.6cm}|p{10.9cm}| .. _cec-core-processing: -.. tabularcolumns:: |p{6.6cm}|p{10.9cm}| - .. flat-table:: Core Message Processing :header-rows: 0 :stub-columns: 0 diff --git a/Documentation/media/uapi/cec/cec-ioc-receive.rst b/Documentation/media/uapi/cec/cec-ioc-receive.rst index 7615c94..a7074a9 100644 --- a/Documentation/media/uapi/cec/cec-ioc-receive.rst +++ b/Documentation/media/uapi/cec/cec-ioc-receive.rst @@ -73,10 +73,10 @@ checked against the received messages to find the corresponding transmit result. -.. _cec-msg: - .. tabularcolumns:: |p{1.0cm}|p{3.5cm}|p{13.0cm}| +.. _cec-msg: + .. flat-table:: struct cec_msg :header-rows: 0 :stub-columns: 0 @@ -251,11 +251,10 @@ result. valid if the :ref:`CEC_TX_STATUS_ERROR ` status bit is set. +.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| .. _cec-tx-status: -.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| - .. flat-table:: CEC Transmit Status :header-rows: 0 :stub-columns: 0 @@ -321,11 +320,10 @@ result. be set to explain which failures were seen. +.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| .. _cec-rx-status: -.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}| - .. flat-table:: CEC Receive Status :header-rows: 0 :stub-columns: 0 -- cgit v1.1