Преглед на файлове

docs/specs: Convert pci-serial.txt to rst

Convert pci-serial.txt to reStructuredText. This includes
some wordsmithing, and the correction of the docs to note
that the Windows inf file includes 2x and 4x support
(as it has done since commit dc9528fdf9f61 in 2014).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20230420160334.1048224-3-peter.maydell@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Peter Maydell преди 2 години
родител
ревизия
3669b594d8
променени са 6 файла, в които са добавени 43 реда и са изтрити 39 реда
  1. 1 0
      docs/specs/index.rst
  2. 3 3
      docs/specs/pci-ids.rst
  3. 37 0
      docs/specs/pci-serial.rst
  4. 0 34
      docs/specs/pci-serial.txt
  5. 1 1
      hw/char/serial-pci-multi.c
  6. 1 1
      hw/char/serial-pci.c

+ 1 - 0
docs/specs/index.rst

@@ -9,6 +9,7 @@ guest hardware that is specific to QEMU.
    :maxdepth: 2
    :maxdepth: 2
 
 
    pci-ids
    pci-ids
+   pci-serial
    ppc-xive
    ppc-xive
    ppc-spapr-xive
    ppc-spapr-xive
    ppc-spapr-numa
    ppc-spapr-numa

+ 3 - 3
docs/specs/pci-ids.rst

@@ -63,11 +63,11 @@ PCI devices (other than virtio):
 1b36:0001
 1b36:0001
   PCI-PCI bridge
   PCI-PCI bridge
 1b36:0002
 1b36:0002
-  PCI serial port (16550A) adapter (``docs/specs/pci-serial.txt``)
+  PCI serial port (16550A) adapter (:doc:`pci-serial`)
 1b36:0003
 1b36:0003
-  PCI Dual-port 16550A adapter (``docs/specs/pci-serial.txt``)
+  PCI Dual-port 16550A adapter (:doc:`pci-serial`)
 1b36:0004
 1b36:0004
-  PCI Quad-port 16550A adapter (``docs/specs/pci-serial.txt``)
+  PCI Quad-port 16550A adapter (:doc:`pci-serial`)
 1b36:0005
 1b36:0005
   PCI test device (``docs/specs/pci-testdev.txt``)
   PCI test device (``docs/specs/pci-testdev.txt``)
 1b36:0006
 1b36:0006

+ 37 - 0
docs/specs/pci-serial.rst

@@ -0,0 +1,37 @@
+=======================
+QEMU PCI serial devices
+=======================
+
+QEMU implements some PCI serial devices which are simple PCI
+wrappers around one or more 16550 UARTs.
+
+There is one single-port variant and two multiport-variants.  Linux
+guests work out-of-the box with all cards.  There is a Windows inf file
+(``docs/qemupciserial.inf``) to set up the cards in Windows guests.
+
+
+Single-port card
+----------------
+
+Name:
+  ``pci-serial``
+PCI ID:
+  1b36:0002
+PCI Region 0:
+   IO bar, 8 bytes long, with the 16550 UART mapped to it.
+Interrupt:
+   Wired to pin A.
+
+
+Multiport cards
+---------------
+
+Name:
+  ``pci-serial-2x``, ``pci-serial-4x``
+PCI ID:
+  1b36:0003 (``-2x``) and 1b36:0004 (``-4x``)
+PCI Region 0:
+   IO bar, with two or four 16550 UARTs mapped after each other.
+   The first is at offset 0, the second at offset 8, and so on.
+Interrupt:
+   Wired to pin A.

+ 0 - 34
docs/specs/pci-serial.txt

@@ -1,34 +0,0 @@
-
-QEMU pci serial devices
-=======================
-
-There is one single-port variant and two muliport-variants.  Linux
-guests out-of-the box with all cards.  There is a Windows inf file
-(docs/qemupciserial.inf) to setup the single-port card in Windows
-guests.
-
-
-single-port card
-----------------
-
-Name:   pci-serial
-PCI ID: 1b36:0002
-
-PCI Region 0:
-   IO bar, 8 bytes long, with the 16550 uart mapped to it.
-   Interrupt is wired to pin A.
-
-
-multiport cards
----------------
-
-Name:   pci-serial-2x
-PCI ID: 1b36:0003
-
-Name:   pci-serial-4x
-PCI ID: 1b36:0004
-
-PCI Region 0:
-   IO bar, with two/four 16550 uart mapped after each other.
-   The first is at offset 0, second at offset 8, ...
-   Interrupt is wired to pin A.

+ 1 - 1
hw/char/serial-pci-multi.c

@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  * THE SOFTWARE.
  */
  */
 
 
-/* see docs/specs/pci-serial.txt */
+/* see docs/specs/pci-serial.rst */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/error.h"

+ 1 - 1
hw/char/serial-pci.c

@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  * THE SOFTWARE.
  */
  */
 
 
-/* see docs/specs/pci-serial.txt */
+/* see docs/specs/pci-serial.rst */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/error.h"