diff --git a/dev/api/io.rst b/dev/api/io.rst index 3a1af17..e984994 100644 --- a/dev/api/io.rst +++ b/dev/api/io.rst @@ -138,7 +138,7 @@ Any given I/O port can have an **unlimited** amount of I/O handlers, such that: Read callbacks can effectively return "don't care" (without interfering with other handlers) by returning a value with all bits set: ``0xff`` for ``inb``, ``0xffff`` for ``inw`` or ``0xffffffff`` for ``inl``. -.. note:: The same callback fallback rules specified above also apply with multiple handlers. Handlers without valid callbacks for the operation's type and width are automatically skipped. +.. note:: The same callback fallback rules specified above also apply with multiple handlers. Handlers without callbacks for the operation's type and (same or lower) width are automatically skipped. I/O traps --------- diff --git a/dev/api/pci.rst b/dev/api/pci.rst index 1b52e89..cfc741f 100644 --- a/dev/api/pci.rst +++ b/dev/api/pci.rst @@ -6,7 +6,7 @@ PCI Adding a device --------------- -PCI devices can be added with the ``pci_add_card`` function in the device's ``init`` callback. A slot is :ref:`automatically selected ` according to the ``add_type``; if the emulated machine runs out of PCI slots, a **DEC 21150** PCI-PCI bridge is automatically deployed to add 9 more slots. +PCI devices can be added with the ``pci_add_card`` function in the device's ``init`` callback. A PCI slot is :ref:`automatically selected ` for the device according to the ``add_type``; if the emulated machine runs out of slots, a **DEC 21150** PCI-PCI bridge is automatically deployed to add 9 more slots, and new devices are placed in the secondary PCI bus under it. .. container:: toggle diff --git a/dev/buildguide.rst b/dev/buildguide.rst index d240c2d..35848af 100644 --- a/dev/buildguide.rst +++ b/dev/buildguide.rst @@ -122,7 +122,7 @@ Ubuntu, Debian .. code-block:: bash - $ sudo apt install build-essential cmake extra-cmake-modules pkg-config libfreetype-dev libsdl2-dev libpng-dev libopenal-dev librtmidi-dev libfaudio-dev qtbase5-dev qttools5-dev libevdev-dev + $ sudo apt install build-essential cmake extra-cmake-modules pkg-config ninja-build libfreetype-dev libsdl2-dev libpng-dev libopenal-dev librtmidi-dev libfaudio-dev qtbase5-dev qttools5-dev libevdev-dev macOS (Homebrew) @@ -130,7 +130,7 @@ macOS (Homebrew) .. code-block:: bash - $ brew install freetype sdl2 libpng openal-soft rtmidi faudio qt@5 + $ brew install cmake pkg-config ninja freetype sdl2 libpng openal-soft rtmidi faudio qt@5 Building -------- diff --git a/usage/menubar.rst b/usage/menubar.rst index 9447b90..8d67a13 100644 --- a/usage/menubar.rst +++ b/usage/menubar.rst @@ -3,6 +3,8 @@ Menu bar The menu bar located at the top of the 86Box window provides controls for the emulated machine as a whole, its display, and the 86Box user interface. +.. important:: On macOS, the **Exit** (Quit), **Preferences** and **About 86Box** options are found in the **86Box** application menu instead of the locations outlined here. + Action ------