From ceac4135f076ff6f20fbe288920f1f42d86e7728 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 17 Oct 2020 14:07:20 -0300 Subject: [PATCH] Add PLIP networking --- dev/builds.rst | 4 ++-- hardware/network.rst | 8 +++++--- settings/display.rst | 2 -- settings/network.rst | 2 ++ settings/peripherals.rst | 4 ++-- settings/ports.rst | 15 ++++++++++----- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dev/builds.rst b/dev/builds.rst index 15ca276..214c332 100644 --- a/dev/builds.rst +++ b/dev/builds.rst @@ -49,10 +49,10 @@ There are many different optimized binaries available for each build, with each BobcatAthlon (2011+)
FX
A/C/E-Series APUOntario, Zacate, Hondo, Llano, Trinity,
Richland, Kabini, Kaveri, Beema, Mullins,
Carrizo, Bristol Ridge, Stoney Ridge ZenRyzen 1000/2000 CPU
Ryzen 2000/3000 APU **Summit Ridge, Raven Ridge, Dali,
Pinnacle Ridge, Picasso Ryzen Threadripper 1000/2000Whitehaven, Colfax - Zen2Ryzen 3000/4000 CPU
Ryzen 4000 APU **Matisse, Renoir, Vermeer + Zen2Ryzen 3000 CPU
Ryzen 4000 APU **
Ryzen 5000 CPUMatisse, Renoir, Vermeer Ryzen Threadripper 3000Castle Peak | \* Older K8 CPUs without SSE3 are not supported. -| \*\* Ryzen APU = models equipped with integrated graphics, including G-series on desktop and U/H-series on mobile. These are always one generation behind; the model numbers are misleading. +| \*\* Ryzen APU = models equipped with integrated graphics, including G-series on desktop and U/H-series on mobile, which use older cores than the CPUs of the same series. diff --git a/hardware/network.rst b/hardware/network.rst index 9278aa8..207f752 100644 --- a/hardware/network.rst +++ b/hardware/network.rst @@ -29,7 +29,7 @@ This mode requires `Npcap `_ (or another WinPcap-compat Private PCap network ^^^^^^^^^^^^^^^^^^^^ -If you have an incompatible network connection on the host (such as Wi-Fi), or if you wish to connect the emulated machine to the host without also connecting it to your network, a private network can be created with PCap in one of two ways: +If you have an incompatible network connection on your host system (such as Wi-Fi), or if you wish to connect the emulated machine to the host without also connecting it to your network, a private network can be created with PCap in one of two ways: * Install and configure the *Microsoft KM-TEST Loopback Adapter* included with Windows. @@ -37,13 +37,15 @@ If you have an incompatible network connection on the host (such as Wi-Fi), or i * The adapter alone only provides a direct connection to the host, with no DHCP server, therefore requiring manual IP configuration on both the host and the emulated machine. * Windows' *Internet Connection Sharing* feature can be used to connect the emulated machine to the host's network and the Internet, with DHCP for automatic IP configuration, similarly to SLiRP but with the added benefit that the host can reach the emulated machine without port forwarding. - * Port forwarding can still be performed through Internet Connection Sharing itself. + * Port forwarding can be performed through Internet Connection Sharing's *Settings*. * If VMware is installed, use one of the VMnet adapters included with it. * *VMnet1* (Host-only) connects to the host only. * *VMnet8* (NAT) connects to the host, its network and the Internet. + * Port forwarding can be performed through the Virtual Network Editor's *NAT Settings*. + Advanced features ----------------- @@ -70,7 +72,7 @@ Each port forward must be assigned a number, starting at 0 and counting up (skip * ``X_udp``: If this directive is missing or set to 0, forward a TCP port. If set to 1, forward an UDP port. * ``X_from``: Port number on the host. -* ``X_to``: Port number on the emulated machine. If this directive is missing, use the same port number as the host. +* ``X_to``: Port number on the emulated machine. If this directive is missing, the port number from ``X_from`` will be used. The host can access forwarded ports through 127.0.0.1 or its own IP address, while other devices on the network can access them through the host's IP address. diff --git a/settings/display.rst b/settings/display.rst index 554c6b1..2232f4a 100644 --- a/settings/display.rst +++ b/settings/display.rst @@ -29,5 +29,3 @@ The *Configure* button provides the following settings: * **Render threads:** allows the Voodoo workload to be split into multiple CPU threads. 2 render threads are recommended for host systems with more than two CPU cores. * **SLI:** add a second Voodoo 2 card to the system, connected to the first one through Scan Line Interleave (SLI). * **Recompiler:** enable the Voodoo recompiler for faster emulation. - -.. note:: The Voodoo recompiler requires a host CPU with SSE2 support. SSE2 is present in most CPUs released since 2005. diff --git a/settings/network.rst b/settings/network.rst index b7a3d76..8e5035b 100644 --- a/settings/network.rst +++ b/settings/network.rst @@ -27,3 +27,5 @@ Network adapter Network card to emulate. Only cards supported by the machine's expansion buses will be listed. The *Configure* button opens a new window with settings specific to the selected network card, such as the I/O port and IRQ for ISA cards. + +The **[LPT] PLIP** network adapter requires a **PLIP Network** device to be attached to one of the :ref:`parallel ports `. diff --git a/settings/peripherals.rst b/settings/peripherals.rst index 32e4646..f764075 100644 --- a/settings/peripherals.rst +++ b/settings/peripherals.rst @@ -13,14 +13,14 @@ The *Configure* button opens a new window with settings specific to the selected HD Controller ------------- -Hard disk drive controller card to emulate. Only cards supported by the machine's expansion buses will be listed. MFM, RLL, ESDI and IDE controllers are available. Selecting an IDE controller is not needed for machines with onboard IDE. +Hard disk drive controller card to emulate. Only cards supported by the machine's expansion buses will be listed. MFM, RLL, ESDI and IDE controllers are available. Selecting an IDE controller is not required for machines with onboard IDE. The *Configure* button opens a new window with settings specific to the selected controller card, such as the BIOS option ROM address. FD Controller ------------- -Floppy disk drive controller card to emulate. Selecting a controller is not needed, unless you wish to use the DTK controllers for adding high-density 1.44M floppy support to XT machines. +Floppy disk drive controller card to emulate. Selecting a controller is not required, unless you wish to use the DTK controllers for adding high-density 1.44M floppy support to XT machines. The BIOS option ROM address used by the selected controller can be configured through the *Settings* button. diff --git a/settings/ports.rst b/settings/ports.rst index 0a24130..8b8777e 100644 --- a/settings/ports.rst +++ b/settings/ports.rst @@ -24,17 +24,22 @@ Emulated device to connect to the given parallel (LPT) port. * **Generic PostScript Printer:** PostScript-compatible printer with PDF output. - * Printed documents are saved as .pdf files in the ``printer`` directory. - * Alternatively, printed documents are saved as .ps files if the PDF conversion process fails, or if the included ``gsdll32.dll`` file is missing from the 86Box directory. + * Printed documents are saved as .ps files in the ``printer`` directory, which are automatically converted to .pdf once printing is completed. + * The original .ps files may remain in the directory if PDF conversion fails, or if the included ``gsdll32.dll`` file is missing from the 86Box directory. * Use the generic PostScript printer driver provided by your operating system. - * Windows 95 and newer do not have a generic PostScript driver; use the **Apple LaserWriter IIf** or **IIg** driver instead. + * Windows 95 and newer do not have a generic PostScript driver; use the **Apple LaserWriter IIf** driver for grayscale, or the **Apple Color LW 12/660 PS** driver for color. + +* **PLIP Network:** A `Parallel Line Internet Protocol `_ cable connected to the :doc:`emulated network `. + + * The :ref:`emulated network adapter ` must also be set to **[LPT] PLIP**. + * PLIP is compatible with the DOS ``plip.com`` packet driver and the Linux ``plip`` driver. It is not compatible with the Windows *Direct Cable Connection* feature or any other parallel port networking implementations. Serial port 1-4 --------------- -Enable emulation of serial ports ranging from COM1 to COM4. Any ports not provided by the motherboard itself will be emulated as generic ISA or VLB serial cards. +Enable emulation of serial ports ranging from COM1 to COM4. Any ports not provided by the machine's motherboard will be emulated as generic ISA or VLB serial cards. Parallel port 1-3 ----------------- -Enable emulation of parallel ports ranging from LPT1 to LPT3. Any ports not provided by the motherboard itself will be emulated as generic ISA or VLB parallel cards. +Enable emulation of parallel ports ranging from LPT1 to LPT3. Any ports not provided by the machine's motherboard will be emulated as generic ISA or VLB parallel cards.