diff --git a/hardware/ideterqua.rst b/hardware/ideterqua.rst index 834aca9..d4de82d 100644 --- a/hardware/ideterqua.rst +++ b/hardware/ideterqua.rst @@ -1,7 +1,7 @@ Tertiary and quaternary IDE =========================== -The additional tertiary and quaternary IDE controllers, enabled through the :ref:`Peripherals settings page `, are not supported by all emulated BIOSes and may require manual configuration of emulated operating systems. The specific details are outlined on this page. +The additional tertiary and quaternary IDE controllers, enabled through the :ref:`Storage controllers ` settings page, are not supported by all emulated BIOSes and may require manual configuration of emulated operating systems. The specific details are outlined on this page. System resources ---------------- @@ -18,7 +18,7 @@ The following resources are used by these additional controllers: These controllers are not Plug and Play compliant. If the emulated machine supports Plug and Play (through ISA, PCI or other means), remember to mark the IRQ(s) as being used by a legacy ISA device in the BIOS setup utility. -.. note:: While the IRQ for each channel can be changed through its respective *Settings* button on :ref:`settings/peripherals:Tertiary / Quaternary IDE Controller`, many operating systems do not allow legacy (ISA or VLB) IDE controllers to use custom IRQs. +.. note:: While the IRQ for each channel can be changed through its respective *Settings* button on :ref:`settings/storage:Tertiary / Quaternary IDE Controller`, many operating systems do not allow legacy (ISA or VLB) IDE controllers to use custom IRQs. BIOS support ------------ diff --git a/settings/display.rst b/settings/display.rst index d6c9a85..7d8e3f2 100644 --- a/settings/display.rst +++ b/settings/display.rst @@ -6,14 +6,14 @@ The *Display* page contains settings related to the emulated machine's 2D and 3D Video ----- -Video card to emulate. Only cards supported by the machine's expansion buses will be listed. On machines equipped with an onboard video chip, the *Internal* option enables the onboard video. +Video card to emulate. This box only lists cards supported by the machine's expansion buses. On machines equipped with an onboard video chip, the *Internal* option enables the onboard video. -The *Configure* button opens a new window with settings specific to the selected video card, such as the amount of installed video memory. +The *Configure* button opens a new window with settings specific to the selected video card, such as the amount of video memory. Voodoo Graphics --------------- -Emulate a **3dfx Voodoo** add-on 3D accelerator, connected to the PCI bus and to the video card selected above. +Emulate a **3dfx Voodoo** add-on 3D accelerator, connected to both the PCI bus and the video card selected above. The *Configure* button provides the following settings: @@ -23,7 +23,7 @@ The *Configure* button provides the following settings: * **Obsidian SB50 + Amethyst:** a variant of the Voodoo Graphics, with two Texture Mapping Units operating at 50 MHz. * **Voodoo 2:** the second Voodoo model, with two Texture Mapping Units operating at 90 MHz, as well as SLI support. -.. note:: The **Voodoo Banshee** and **Voodoo 3** are independent video cards, which are not found here; they must be selected through the :ref:`settings/display:Video` box above. For these cards, the *Configure* button next to the :ref:`settings/display:Video` box provides similar settings to the ones listed here. +.. 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. For these cards, the *Configure* button next to the :ref:`settings/display:Video` box provides similar settings to the ones listed here. * **Framebuffer memory size** / **Texture memory size**: amount of video memory for the Frame Buffer Interface and Texture Mapping Unit(s), respectively. * **Bilinear filtering:** apply bilinear filtering to smooth out textures displayed on the screen. diff --git a/settings/index.rst b/settings/index.rst index bbb7d0c..04edc54 100644 --- a/settings/index.rst +++ b/settings/index.rst @@ -15,7 +15,8 @@ If any changes were made to the settings, you will be asked whether or not you w sound network ports - peripherals + storage hdd floppycdrom removable + peripherals diff --git a/settings/input.rst b/settings/input.rst index 20328fa..f9b98c6 100644 --- a/settings/input.rst +++ b/settings/input.rst @@ -19,15 +19,15 @@ Joystick Emulate one or more game port controller(s). The following controller types are supported: -* **Standard 2-button joystick(s):** up to two controllers, each with two buttons and a single analog stick. -* **Standard 4-button joystick:** single controller with four buttons and a single analog stick. -* **Standard 6-button joystick:** single controller with four regular buttons, two additional buttons mapped to the third and fourth axes, and a single analog stick. -* **Standard 8-button joystick:** single controller with four regular buttons, four additional buttons mapped to the third and fourth axes, and a single analog stick. -* **4-axis 4-button joystick:** single controller with four buttons and four axes (or two analog sticks). +* **None:** no controller connected. +* **Standard 2-button joystick(s):** up to two controllers, each with two buttons and an analog stick. +* **Standard 4-button joystick:** single controller with four buttons and an analog stick. +* **Standard 6-button joystick:** single controller with four regular buttons, two additional buttons mapped to the third and fourth axes, and an analog stick. +* **Standard 8-button joystick:** single controller with four regular buttons, four additional buttons mapped to the third and fourth axes, and an analog stick. +* **4-axis 4-button joystick:** single controller with four buttons and two analog sticks (or four axes). * **CH Flightstick Pro:** flight controller with four buttons, three axes and a POV hat. -* **Microsoft SideWinder Pad:** up to four controllers, each with 10 buttons and a directional pad. Requires a driver to be installed on the emulated operating system. +* **Microsoft SideWinder Pad:** up to four controllers, each with 10 buttons and a directional pad. Not compatible with standard game port joysticks; requires a driver in the emulated machine. * **Thrustmaster Flight Control System:** flight controller with four buttons, two axes and a POV hat. -* **No joystick:** no controller connected. Joystick 1-4... --------------- @@ -36,4 +36,4 @@ Configure the mappings for each emulated game port controller. The *Device* box If you're not sure as to what axis or button numbers map to which sticks and buttons on the real controller, use the *Test* feature of Windows' *Game Controllers* control panel (``joy.cpl``). Keep in mind 86Box's button numbers start with 0, whereas the control panel's numbers start with 1. -.. note:: Only DInput controllers are supported at the moment. XInput controllers can still be used through their DInput emulation mode, with no action required. +.. note:: XInput controllers are accessed through their DInput emulation mode at the moment. diff --git a/settings/machine.rst b/settings/machine.rst index 92df5c6..6a29f3b 100644 --- a/settings/machine.rst +++ b/settings/machine.rst @@ -6,29 +6,29 @@ The *Machine* page contains settings related to the emulated machine as a whole, Machine type / Machine ---------------------- -Machine/motherboard model to emulate. The *Machine type* box lists all available machine classes, while the *Machine* box lists all available machine models on the selected class. +Machine/motherboard model to emulate. The *Machine* box lists all available models for the machine class selected on the *Machine type* box. The *Configure* button opens a new window with settings specific to the machine's onboard devices, such as the amount of installed video memory for an onboard video chip. -CPU type / CPU --------------- +CPU type / Speed +---------------- -Main processor to emulate. Only processors supported by the selected machine will be listed. +Main processor to emulate. The *Speed* box lists all available speed grades for the processor family selected on the *CPU type* box. These boxes only list processor types and speed grades supported by the machine selected above. FPU --- -Math co-processor to emulate. This box will not be enabled if a processor with an integrated math co-processor is selected. +Math co-processor to emulate. This box is not available if the processor selected above has an integrated co-processor or lacks support for an external one. Wait states ----------- -Number of memory wait states to use on a 286- or 386-class processor. This box will not be enabled if any other processor family is selected. +Number of memory wait states to use on a 286- or 386-class processor. This box is not available if any other processor family is selected above. Memory ------ -Amount of RAM to give the emulated machine. The minimum and maximum allowed amounts of RAM will vary depending on the selected machine. +Amount of RAM to give the emulated machine. The minimum and maximum allowed amounts of RAM will vary depending on the machine selected above. Dynamic Recompiler ------------------ diff --git a/settings/network.rst b/settings/network.rst index 8e5035b..c72c92d 100644 --- a/settings/network.rst +++ b/settings/network.rst @@ -28,4 +28,4 @@ Network card to emulate. Only cards supported by the machine's expansion buses w 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 `. +The **[LPT] Parallel Port Internet Protocol** network adapter requires a **PLIP Network** device to be attached to a :ref:`parallel port `. diff --git a/settings/peripherals.rst b/settings/peripherals.rst index 0ef22be..8da5051 100644 --- a/settings/peripherals.rst +++ b/settings/peripherals.rst @@ -3,56 +3,6 @@ Other peripherals The *Other peripherals* page contains settings related to disk drive controllers, memory expansions and other expansion cards. -SCSI Controller ---------------- - -SCSI host bus adapter 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 SCSI card, such as the I/O port and IRQ for ISA cards. - -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 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 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. - -Tertiary / Quaternary IDE Controller ------------------------------------- - -Add a third or fourth (respectively) IDE channel to the emulated machine, through a generic ISA or VLB IDE controller card. - -The IRQ used by each controller can be configured through its respective *Settings* button. - -.. note:: The tertiary and quaternary controllers are not Plug and Play compliant; they may require manual configuration of emulated operating systems, and may not be bootable. See :doc:`../hardware/ideterqua` for more information. - -ISABugger ---------- - -Emulate an **ISABugger** debugging interface card, equipped with two hexadecimal displays and two LED banks, all controlled by the emulated machine. See :doc:`../hardware/isabugger` for documentation on the card's features. - -POST card ---------- - -Emulate a diagnostic POST card, which displays POST code values issued by the emulated machine's BIOS on the status bar. See :ref:`Status bar: POST card ` for more information. - -The POST card will automatically use the correct diagnostic I/O port for the emulated machine: - -* Port 60h on the IBM XT; -* Port 80h on the IBM AT, clones and the XT-based Xi 8088; -* Port 84h on early Compaq machines; -* Port 0190h on IBM PS/1 and PS/2 machines not based on the Micro Channel Architecture; -* Port 0680h on Micro Channel Architecture machines. - -.. note:: Some guest operating systems and applications use port 80h (which is shared with the POST card) for other purposes. If you notice the POST code display is flickering and the emulation speed has decreased drastically, try disabling the POST card. - ISA RTC ------- @@ -67,3 +17,24 @@ ISA Memory Expansion Add up to four ISA-based memory expansion cards, for machines which support memory expansion through the ISA bus. The memory start address and size for each expansion card can be configured through its respective *Settings* button. + +ISABugger +--------- + +Emulate an **ISABugger** debugging interface card, equipped with two hexadecimal displays and two LED banks, all controlled by the emulated machine. See :doc:`../hardware/isabugger` for documentation on the card's features. + +POST card +--------- + +Emulate a diagnostic POST card, which displays POST code values issued by the emulated machine's BIOS on the status bar. See :ref:`Status bar: POST card ` for more information. + +The POST card will automatically use the correct diagnostic I/O port for the emulated machine: + +* Port 10h on the IBM PCjr; +* Port 60h on the IBM XT; +* Port 80h on the IBM AT, clones and the XT-based Xi 8088; +* Port 84h on early Compaq machines; +* Port 0190h on IBM PS/1 and PS/2 machines not based on the Micro Channel Architecture; +* Port 0680h on Micro Channel Architecture machines. + +.. note:: Some guest operating systems and applications use port 80h (which is shared with the POST card on most machines) for other purposes. If you notice the POST code display is flickering and the emulation speed has decreased drastically, try disabling the POST card. \ No newline at end of file diff --git a/settings/ports.rst b/settings/ports.rst index f311381..7e126cd 100644 --- a/settings/ports.rst +++ b/settings/ports.rst @@ -32,7 +32,7 @@ Emulated device to connect to the given parallel (LPT) port. * **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. + * PLIP is compatible with the DOS ``plip.com`` packet driver and the Linux ``plip`` driver (only with interrupts enabled). It is not compatible with the Windows *Direct Cable Connection* feature or any other parallel port networking implementations. * PLIP works best with the **SLiRP** :ref:`network type ` due to its point-to-point nature. Serial port 1-4 diff --git a/settings/storage.rst b/settings/storage.rst new file mode 100644 index 0000000..b3504d6 --- /dev/null +++ b/settings/storage.rst @@ -0,0 +1,34 @@ +Storage controllers +=================== + +The *Storage controllers* page contains settings related to the emulated machine's disk drive controllers. + +SCSI Controller +--------------- + +SCSI host bus adapter card to emulate. This box only lists cards supported by the machine's expansion buses. + +The *Configure* button opens a new window with settings specific to the selected SCSI card, such as the I/O port and IRQ for ISA cards. + +HD Controller +------------- + +Hard disk drive controller card to emulate. This box only lists cards supported by the machine's expansion buses. 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 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. + +Tertiary / Quaternary IDE Controller +------------------------------------ + +Add a third or fourth (respectively) IDE channel to the emulated machine, through a generic ISA or VLB IDE controller card. + +The IRQ used by each controller can be configured through its respective *Settings* button. + +.. note:: The tertiary and quaternary controllers are not Plug and Play compliant; they may require manual configuration of emulated operating systems, and may not be bootable. See :doc:`../hardware/ideterqua` for more information. \ No newline at end of file