diff --git a/hardware/diskimages.rst b/hardware/diskimages.rst index 37848c4..52794aa 100644 --- a/hardware/diskimages.rst +++ b/hardware/diskimages.rst @@ -156,7 +156,7 @@ Supported formats: * - PCjs JSON - .json - - Read only. PCjs 1.0 format only; 2.0 not supported yet. + - Read only. 86Box 4.2 added support for the v2 format, replacing v1 which is no longer in circulation. * - Teledisk - .td0 diff --git a/hardware/network.rst b/hardware/network.rst index 3bab033..fa2e711 100644 --- a/hardware/network.rst +++ b/hardware/network.rst @@ -150,27 +150,16 @@ This guide only covers the basics of VDE. It provides many more useful features * Connecting to **other emulators and virtualizers** with VDE support such as QEMU and VirtualBox * Creating **VLANs and access control policies** which can be assigned to switch ports +Modem +----- + +.. note:: Documentation coming soon. + Advanced networking features ---------------------------- The following advanced features can be accessed by directly editing the emulated machine's configuration file, which is ``86box.cfg`` by default. -MAC address -^^^^^^^^^^^ - -With the exception of **[LPT] Parallel Port Internet Protocol**, every emulated network card stores its MAC address in the ``mac`` directive of its respective configuration file section. Only the suffix (last three octets) of the MAC address can be edited; the prefix (first three octets) will always be an `Organizationally Unique Identifier `_ belonging to the manufacturer, such as ``00:E0:4C`` for Realtek. - -.. container:: toggle-always-show - - .. container:: toggle-header - - Example: MAC address ``00:E0:4C:35:F4:C2`` for the Realtek RTL8029AS - - .. code-block:: none - - [Realtek RTL8029AS] - mac = 35:f4:c2 - SLiRP port forwarding ^^^^^^^^^^^^^^^^^^^^^ diff --git a/settings/display.rst b/settings/display.rst index 55313a4..35ebedb 100644 --- a/settings/display.rst +++ b/settings/display.rst @@ -24,7 +24,7 @@ Voodoo Graphics Emulate a **3dfx Voodoo** add-on 3D accelerator, connected to both the PCI bus and the video card selected above. -.. note:: The **Voodoo Banshee** and **Voodoo 3** are independent video cards, which are not found here; they must be selected on the :ref:`settings/display:Video` box above, and this Voodoo Graphics option **must be disabled**. For these cards, the *Configure* button next to the :ref:`settings/display:Video` box provides similar settings to the ones listed below. +.. note:: The **Voodoo Banshee** and **Voodoo 3** are independent video cards, which are not found here; they must be selected on the :ref:`settings/display:Video` box above, and this Voodoo Graphics option **cannot be selected** alongside them. For these cards, the *Configure* button next to the :ref:`settings/display:Video` box provides similar settings to the ones listed below. The *Configure* button provides the following settings: diff --git a/settings/hdd.rst b/settings/hdd.rst index c5e5cc5..1d9a64b 100644 --- a/settings/hdd.rst +++ b/settings/hdd.rst @@ -31,7 +31,7 @@ The *New...* button opens a new window allowing you to create an existing hard d * **Cylinders/Heads/Sectors:** CHS parameters for the disk image. These boxes control the *Size (MB)* box below. * **Size (MB):** the disk image's size in MB. This box controls the *Cylinders*, *Heads* and *Sectors* boxes above. There are limits to how big a hard disk image can be; see :ref:`hardware/diskimages:Hard disk size limits` for more information. * **Bus:** storage bus to attach the disk to. -* **Channel**/**ID:** where to attach the disk on the selected storage bus. +* **Channel**/**ID:** where to attach the disk on the selected storage bus. Channels/IDs that are already in use cannot be selected. * On IDE disks, the first number corresponds to the IDE channel, and the second number corresponds to the Master/Slave position: @@ -55,7 +55,7 @@ The *New...* button opens a new window allowing you to create an existing hard d |3:1 |Quaternary|Slave | +-----+----------+------+ - * On SCSI disks, the first number corresponds to the :ref:`SCSI controller ` (starting at 0 instead of 1), and the second number is the SCSI ID within that controller: + * On SCSI disks, the first number corresponds to the controller's index, starting from 0 and following the order of: on-board SCSI controllers if present, then :ref:`sound cards ` with SCSI if present, then :ref:`configured SCSI controllers `; the second number is the SCSI ID within that controller: +-----+------------+-------+ |Value|Controller |SCSI ID| diff --git a/settings/network.rst b/settings/network.rst index 6ae1fc2..c23ac0b 100644 --- a/settings/network.rst +++ b/settings/network.rst @@ -34,9 +34,12 @@ 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 *Configure* button opens a new window with settings specific to the selected network card, such as the MAC address for Ethernet cards, and the I/O port and IRQ for ISA cards. -The **[LPT] Parallel Port Internet Protocol** network adapter requires a **PLIP Network** device to be attached to a :ref:`parallel port `. +.. note:: + * The MAC address is partially configurable and always prefixed by an `Organizationally Unique Identifier `_ belonging to the card's manufacturer, such as ``00:E0:4C`` for Realtek. + * The **[LPT] Parallel Port Internet Protocol** network adapter requires a **PLIP Network** device to be attached to a :ref:`parallel port `. + * Settings for the **[COM] Standard Hayes-complaint Modem** are described on :ref:`Networking `. VDE Socket ^^^^^^^^^^