Bring up to par with master.

.ci/AppImageBuilder.yml

@@ -48,6 +48,7 @@ AppDir:
     - libfreetype6
     - libgomp1
     - libgs9
+    - libinstpatch-1.0-2
     - libpng16-16
     - libqt5core5a # if QT:BOOL=ON
     - libqt5gui5 # if QT:BOOL=ON

.ci/build.sh

@@ -12,7 +12,7 @@
 #
 # Authors: RichardG, <richardg867@gmail.com>
 #
-#          Copyright 2021-2023 RichardG.
+#          Copyright 2021-2026 RichardG.
 #
 
 #
@@ -334,6 +334,7 @@ toolchain_file="cmake/$toolchain.cmake"
 toolchain_file_libs=
 
 # Perform platform-specific setup.
+cc_binary=gcc
 strip_binary=strip
 if is_windows
 then
@@ -377,7 +378,7 @@ then
 		fi
 
 		# Establish general dependencies.
-		pkgs="git"
+		pkgs="git make"
 
 		# Gather installed architecture-specific packages for updating.
 		# This prevents outdated shared libraries, unmet dependencies
@@ -698,7 +699,7 @@ else
 	# ...and the ones we do want listed. Non-dev packages fill missing spots on the list.
 	libpkgs=""
 	longest_libpkg=0
-	for pkg in libc6-dev libstdc++6 libopenal-dev libfreetype6-dev libx11-dev libsdl2-dev libpng-dev librtmidi-dev qtdeclarative5-dev libwayland-dev libevdev-dev libxkbcommon-x11-dev libglib2.0-dev libslirp-dev libfaudio-dev libaudio-dev libjack-jackd2-dev libpipewire-0.3-dev libsamplerate0-dev libsndio-dev libvdeplug-dev libfluidsynth-dev libsndfile1-dev libserialport-dev
+	for pkg in libc6-dev libstdc++6 libopenal-dev libfreetype6-dev libx11-dev libsdl2-dev libpng-dev librtmidi-dev qtdeclarative5-dev libwayland-dev libevdev-dev libxkbcommon-x11-dev libglib2.0-dev libslirp-dev libfaudio-dev libaudio-dev libjack-jackd2-dev libpipewire-0.3-dev libsamplerate0-dev libsndio-dev libvdeplug-dev libfluidsynth-dev libsndfile1-dev libinstpatch-dev libserialport-dev
 	do
 		libpkgs="$libpkgs $pkg:$arch_deb"
 		length=$(echo -n $pkg | sed 's/-dev$//' | sed "s/qtdeclarative/qt/" | wc -c)
@@ -742,6 +743,7 @@ set(ENV{PKG_CONFIG_LIBDIR} "/usr/lib/$libdir/pkgconfig:/usr/share/$libdir/pkgcon
 include("$(realpath "$toolchain_file")")
 EOF
 	toolchain_file="$toolchain_file_new"
+	cc_binary="$arch_triplet-gcc"
 	strip_binary="$arch_triplet-strip"
 
 	# Create a separate toolchain file for library compilation without including
@@ -881,14 +883,14 @@ then
 fi
 
 # Download assets if we're making a release build.
+git_repo=$(git remote get-url origin 2> /dev/null)
+if [ "$CI" = "true" ]
+then
+	# Backup strategy when running under Jenkins.
+	[ -z "$git_repo" ] && git_repo=$GIT_URL
+fi
 if grep -qiE "^BUILD_TYPE:[^=]+=release" build/CMakeCache.txt 2> /dev/null
 then
-	git_repo=$(git remote get-url origin 2> /dev/null)
-	if [ "$CI" = "true" ]
-	then
-		# Backup strategy when running under Jenkins.
-		[ -z "$git_repo" ] && git_repo=$GIT_URL
-	fi
 	if [ -n "$git_repo" ]
 	then
 		echo [-] Downloading assets
@@ -905,6 +907,17 @@ then
 	fi
 fi
 
+# Build mdsx library.
+debug_args=
+grep -qiE "^CMAKE_BUILD_TYPE:[^=]+=Debug" build/CMakeCache.txt && debug_args=DEBUG=y
+cd archive_tmp
+git clone --depth 1 "$(dirname "$git_repo")/mdsx.git" mdsx || exit 99
+make -C mdsx/src -j$(nproc) CC="$cc_binary" STRIP="$strip_binary" $debug_args || exit 99
+rm -f mdsx/src/*.a
+mv mdsx/src/mdsx.* . || exit 99
+rm -rf mdsx
+cd ..
+
 # Archive the executable and its dependencies.
 # The executable should always be archived last for the check after this block.
 status=0
@@ -952,6 +965,9 @@ then
 		unzip -j "$discord_zip" "lib/$arch_discord/discord_game_sdk.dylib" -d "archive_tmp/"*".app/Contents/Frameworks"
 		[ ! -e "archive_tmp/"*".app/Contents/Frameworks/discord_game_sdk.dylib" ] && echo [!] No Discord Game SDK for architecture [$arch_discord]
 
+		# Archive mdsx library.
+		mv "archive_tmp/mdsx.dylib" "archive_tmp/"*".app/Contents/Frameworks/"
+
 		# Hack to convert x86_64 binaries to x86_64h when building that architecture.
 		if [ "$arch" = "x86_64h" ]
 		then
@@ -1081,7 +1097,8 @@ else
 		wget -qO - https://github.com/FluidSynth/fluidsynth/archive/refs/tags/v2.3.0.tar.gz | tar zxf - -C "$cache_dir" || rm -rf "$prefix"
 	fi
 	prefix_build="$prefix/build-$arch_deb"
-	cmake -G Ninja -D enable-dbus=OFF -D enable-jack=OFF -D enable-oss=OFF -D enable-sdl2=OFF -D enable-pulseaudio=OFF -D enable-pipewire=OFF -D enable-alsa=OFF \
+	cmake -G Ninja -D enable-jack=OFF -D enable-oss=OFF -D enable-sdl2=OFF -D enable-pulseaudio=OFF -D enable-pipewire=OFF -D enable-alsa=OFF \
+		-D enable-aufile=OFF -D enable-dbus=OFF -D enable-network=OFF -D enable-ipv6=OFF \
 		-D "CMAKE_TOOLCHAIN_FILE=$toolchain_file_libs" -D "CMAKE_INSTALL_PREFIX=$cwd_root/archive_tmp/usr" \
 		-S "$prefix" -B "$prefix_build" || exit 99
 	cmake --build "$prefix_build" -j$(nproc) || exit 99
@@ -1136,6 +1153,9 @@ else
 	7z e -y -o"archive_tmp/usr/lib" "$discord_zip" "lib/$arch_discord/discord_game_sdk.so"
 	[ ! -e "archive_tmp/usr/lib/discord_game_sdk.so" ] && echo [!] No Discord Game SDK for architecture [$arch_discord]
 
+	# Archive mdsx library.
+	mv "archive_tmp/mdsx.so" "archive_tmp/usr/lib/"
+
 	# Archive readme with library package versions.
 	echo Libraries used to compile this $arch build of $project: > archive_tmp/README
 	dpkg-query -f '${Package} ${Version}\n' -W $libpkgs | sed "s/-dev / /" | sed "s/qtdeclarative/qt/" | while IFS=" " read pkg version
@@ -1257,7 +1277,7 @@ EOF
 	then
 		rm -rf "$cache_dir/appimage-builder-"* # remove old versions
 		python3 -m venv "$appimage_builder_dir" # venv to solve some Debian setuptools headaches
-		"$appimage_builder_dir/bin/pip" install -U "git+https://github.com/AppImageCrafters/appimage-builder.git@$appimage_builder_commit"
+		"$appimage_builder_dir/bin/pip" install -U "git+https://github.com/AppImageCrafters/appimage-builder.git@$appimage_builder_commit" 'setuptools<81'
 	fi
 
 	# Symlink appimage-builder global cache directory.

.ci/dependencies_msys.txt

@@ -15,3 +15,4 @@ qt5-translations
 vulkan-headers
 libsndfile
 libserialport
+make

CMakeLists.txt

@@ -36,7 +36,7 @@ if(MUNT_EXTERNAL)
 endif()
 
 project(86Box
-    VERSION 5.4
+    VERSION 6.0
     DESCRIPTION "Emulator of x86-based systems"
     HOMEPAGE_URL "https://86box.net"
     LANGUAGES C CXX)
@@ -180,7 +180,6 @@ cmake_dependent_option(ISAMEM_RAMPAGE "AST Rampage"
 cmake_dependent_option(ISAMEM_IAB     "Intel Above Board"                        ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(ISAMEM_BRAT    "BocaRAM/AT"                               ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(OPL4ML         "OPL4-ML daughterboard"                    ON    "DEV_BRANCH"  OFF)
-cmake_dependent_option(PCL            "Generic PCL5e Printer"                    ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(SIO_DETECT     "Super I/O Detection Helper"               ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(WACOM          "Wacom Input Devices"                      ON    "DEV_BRANCH"  OFF)
 cmake_dependent_option(XL24           "ATI VGA Wonder XL24 (ATI-28800-6)"        ON    "DEV_BRANCH"  OFF)

debian/changelog

@@ -1,5 +1,5 @@
-86box (5.4) UNRELEASED; urgency=medium
+86box (6.0) UNRELEASED; urgency=medium
 
   * Bump release.
 
- -- Jasmine Iwanek <jriwanek@gmail.com>  Tue, 23 Dec 2025 00:27:45 +0100
+ -- Jasmine Iwanek <jriwanek@gmail.com>  Wed, 28 Jan 2026 08:45:23 +0100

src/86box.c

@@ -682,12 +682,12 @@ delete_nvr_file(uint8_t flash)
 extern void  device_find_all_descs(void);
 
 static void
-pc_show_usage(char *s)
+pc_show_usage(void)
 {
     char p[8192] = { 0 };
 
     sprintf(p,
-            "\n%sUsage: 86box [options] [cfg-file]\n\n"
+            "\nUsage: 86box [options] [cfg-file]\n\n"
             "Valid options are:\n\n"
             "-? or --help\t\t\t- show this information\n"
             "-A or --assetpath path\t\t- set 'path' to be asset path\n"
@@ -736,16 +736,12 @@ pc_show_usage(char *s)
             "-Y or --donothing\t\t- do not show any UI or run the emulation\n"
 #endif
             "-Z or --lastvmpath\t\t- the last param. is VM path rather than config\n"
-            "\nA config file can be specified. If none is, the default file will be used.\n",
-            s);
+            "\nA config file can be specified. If none is, the default file will be used.\n");
 
 #ifdef _WIN32
-    ui_msgbox(MBX_ANSI | ((s == NULL) ? MBX_INFO : MBX_WARNING), p);
+    ui_msgbox(MBX_ANSI | MBX_INFO, p);
 #else
-    if (s == NULL)
-        always_log("%s", p);
-    else
-        ui_msgbox(MBX_ANSI | MBX_WARNING, p);
+    always_log("%s", p);
 #endif
 }
 
@@ -845,7 +841,7 @@ pc_init(int argc, char *argv[])
                 }
             }
 
-            pc_show_usage("");
+            pc_show_usage();
             return 0;
         } else if (!strcasecmp(argv[c], "--lastvmpath") || !strcasecmp(argv[c], "-Z")) {
             lvmp = 1;
@@ -1708,6 +1704,8 @@ pc_reset_hard_init(void)
 
     ide_hard_reset();
 
+    lpt_ports_reset();
+
     /* Initialize the actual machine and its basic modules. */
     machine_init();
 

src/chipset/ali1435.c

@@ -98,7 +98,7 @@ ali1435_update_irqs(ali1435_t *dev, int set)
 }
 
 static void
-ali1435_pci_write(int func, int addr, uint8_t val, void *priv)
+ali1435_pci_write(int func, int addr, UNUSED(int len), uint8_t val, void *priv)
 {
     ali1435_t *dev = (ali1435_t *) priv;
     int        irq;
@@ -163,7 +163,7 @@ ali1435_pci_write(int func, int addr, uint8_t val, void *priv)
 }
 
 static uint8_t
-ali1435_pci_read(int func, int addr, void *priv)
+ali1435_pci_read(int func, int addr, UNUSED(int len), void *priv)
 {
     const ali1435_t *dev = (ali1435_t *) priv;
     uint8_t          ret;

src/chipset/ali1489.c

@@ -411,7 +411,7 @@ ali1489_read(uint16_t addr, void *priv)
 }
 
 static void
-ali1489_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
+ali1489_pci_write(UNUSED(int func), int addr, UNUSED(int len), uint8_t val, void *priv)
 {
     ali1489_t *dev = (ali1489_t *) priv;
 
@@ -434,7 +434,7 @@ ali1489_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 }
 
 static uint8_t
-ali1489_pci_read(UNUSED(int func), int addr, void *priv)
+ali1489_pci_read(UNUSED(int func), int addr, UNUSED(int len), void *priv)
 {
     const ali1489_t *dev = (ali1489_t *) priv;
     uint8_t          ret = 0xff;

src/chipset/ali1531.c

@@ -132,7 +132,7 @@ ali1531_shadow_recalc(UNUSED(int cur_reg), ali1531_t *dev)
 }
 
 static void
-ali1531_write(UNUSED(int func), int addr, uint8_t val, void *priv)
+ali1531_write(UNUSED(int func), int addr, UNUSED(int len), uint8_t val, void *priv)
 {
     ali1531_t *dev = (ali1531_t *) priv;
 
@@ -298,7 +298,7 @@ ali1531_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 }
 
 static uint8_t
-ali1531_read(UNUSED(int func), int addr, void *priv)
+ali1531_read(UNUSED(int func), int addr, UNUSED(int len), void *priv)
 {
     const ali1531_t *dev = (ali1531_t *) priv;
     uint8_t          ret = 0xff;
@@ -341,18 +341,18 @@ ali1531_reset(void *priv)
     dev->pci_conf[0x5a] = 0x20;
     dev->pci_conf[0x70] = 0x22;
 
-    ali1531_write(0, 0x42, 0x00, dev);
-    ali1531_write(0, 0x43, 0x00, dev);
+    ali1531_write(0, 0x42, 1, 0x00, dev);
+    ali1531_write(0, 0x43, 1, 0x00, dev);
 
-    ali1531_write(0, 0x47, 0x00, dev);
-    ali1531_write(0, 0x48, 0x00, dev);
+    ali1531_write(0, 0x47, 1, 0x00, dev);
+    ali1531_write(0, 0x48, 1, 0x00, dev);
 
     for (uint8_t i = 0; i < 4; i++)
-        ali1531_write(0, 0x4c + i, 0x00, dev);
+        ali1531_write(0, 0x4c + i, 1, 0x00, dev);
 
     for (uint8_t i = 0; i < 16; i += 2) {
-        ali1531_write(0, 0x60 + i, 0x08, dev);
-        ali1531_write(0, 0x61 + i, 0x40, dev);
+        ali1531_write(0, 0x60 + i, 1, 0x08, dev);
+        ali1531_write(0, 0x61 + i, 1, 0x40, dev);
     }
 }
 

src/chipset/ali1541.c

@@ -177,7 +177,7 @@ ali1541_mask_bar(ali1541_t *dev)
 }
 
 static void
-ali1541_write(UNUSED(int func), int addr, uint8_t val, void *priv)
+ali1541_write(UNUSED(int func), int addr, UNUSED(int len), uint8_t val, void *priv)
 {
     ali1541_t *dev = (ali1541_t *) priv;
 
@@ -562,7 +562,7 @@ ali1541_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 }
 
 static uint8_t
-ali1541_read(UNUSED(int func), int addr, void *priv)
+ali1541_read(UNUSED(int func), int addr, UNUSED(int len), void *priv)
 {
     const ali1541_t *dev = (ali1541_t *) priv;
     uint8_t          ret = 0xff;
@@ -613,20 +613,20 @@ ali1541_reset(void *priv)
     dev->pci_conf[0xe0] = 0x01;
 
     cpu_cache_int_enabled = 1;
-    ali1541_write(0, 0x42, 0x00, dev);
+    ali1541_write(0, 0x42, 1, 0x00, dev);
 
-    ali1541_write(0, 0x54, 0x00, dev);
-    ali1541_write(0, 0x55, 0x00, dev);
+    ali1541_write(0, 0x54, 1, 0x00, dev);
+    ali1541_write(0, 0x55, 1, 0x00, dev);
 
     for (uint8_t i = 0; i < 4; i++)
-        ali1541_write(0, 0x56 + i, 0x00, dev);
+        ali1541_write(0, 0x56 + i, 1, 0x00, dev);
 
-    ali1541_write(0, 0x60, 0x07, dev);
-    ali1541_write(0, 0x61, 0x40, dev);
+    ali1541_write(0, 0x60, 1, 0x07, dev);
+    ali1541_write(0, 0x61, 1, 0x40, dev);
 
     for (uint8_t i = 0; i < 14; i += 2) {
-        ali1541_write(0, 0x62 + i, 0x00, dev);
-        ali1541_write(0, 0x63 + i, 0x00, dev);
+        ali1541_write(0, 0x62 + i, 1, 0x00, dev);
+        ali1541_write(0, 0x63 + i, 1, 0x00, dev);
     }
 }